| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/gtk/location_bar_view_gtk.h" | 5 #include "chrome/browser/gtk/location_bar_view_gtk.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "app/gtk_dnd_util.h" | 9 #include "app/gtk_dnd_util.h" |
| 10 #include "app/l10n_util.h" | 10 #include "app/l10n_util.h" |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/gtk/cairo_cached_surface.h" | 32 #include "chrome/browser/gtk/cairo_cached_surface.h" |
| 33 #include "chrome/browser/gtk/content_setting_bubble_gtk.h" | 33 #include "chrome/browser/gtk/content_setting_bubble_gtk.h" |
| 34 #include "chrome/browser/gtk/extension_popup_gtk.h" | 34 #include "chrome/browser/gtk/extension_popup_gtk.h" |
| 35 #include "chrome/browser/gtk/first_run_bubble.h" | 35 #include "chrome/browser/gtk/first_run_bubble.h" |
| 36 #include "chrome/browser/gtk/gtk_theme_provider.h" | 36 #include "chrome/browser/gtk/gtk_theme_provider.h" |
| 37 #include "chrome/browser/gtk/gtk_util.h" | 37 #include "chrome/browser/gtk/gtk_util.h" |
| 38 #include "chrome/browser/gtk/nine_box.h" | 38 #include "chrome/browser/gtk/nine_box.h" |
| 39 #include "chrome/browser/gtk/rounded_window.h" | 39 #include "chrome/browser/gtk/rounded_window.h" |
| 40 #include "chrome/browser/gtk/view_id_util.h" | 40 #include "chrome/browser/gtk/view_id_util.h" |
| 41 #include "chrome/browser/instant/instant_controller.h" | 41 #include "chrome/browser/instant/instant_controller.h" |
| 42 #include "chrome/browser/location_bar_util.h" | |
| 43 #include "chrome/browser/profile.h" | 42 #include "chrome/browser/profile.h" |
| 44 #include "chrome/browser/search_engines/template_url.h" | 43 #include "chrome/browser/search_engines/template_url.h" |
| 45 #include "chrome/browser/search_engines/template_url_model.h" | 44 #include "chrome/browser/search_engines/template_url_model.h" |
| 46 #include "chrome/browser/tab_contents/tab_contents.h" | 45 #include "chrome/browser/tab_contents/tab_contents.h" |
| 47 #include "chrome/browser/ui/browser.h" | 46 #include "chrome/browser/ui/browser.h" |
| 47 #include "chrome/browser/ui/omnibox/location_bar_util.h" |
| 48 #include "chrome/common/extensions/extension.h" | 48 #include "chrome/common/extensions/extension.h" |
| 49 #include "chrome/common/extensions/extension_action.h" | 49 #include "chrome/common/extensions/extension_action.h" |
| 50 #include "chrome/common/extensions/extension_resource.h" | 50 #include "chrome/common/extensions/extension_resource.h" |
| 51 #include "chrome/common/notification_service.h" | 51 #include "chrome/common/notification_service.h" |
| 52 #include "chrome/common/page_transition_types.h" | 52 #include "chrome/common/page_transition_types.h" |
| 53 #include "chrome/common/pref_names.h" | 53 #include "chrome/common/pref_names.h" |
| 54 #include "gfx/canvas_skia_paint.h" | 54 #include "gfx/canvas_skia_paint.h" |
| 55 #include "gfx/font.h" | 55 #include "gfx/font.h" |
| 56 #include "gfx/gtk_util.h" | 56 #include "gfx/gtk_util.h" |
| 57 #include "grit/generated_resources.h" | 57 #include "grit/generated_resources.h" |
| (...skipping 1467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1525 | 1525 |
| 1526 std::string badge_text = page_action_->GetBadgeText(tab_id); | 1526 std::string badge_text = page_action_->GetBadgeText(tab_id); |
| 1527 if (badge_text.empty()) | 1527 if (badge_text.empty()) |
| 1528 return FALSE; | 1528 return FALSE; |
| 1529 | 1529 |
| 1530 gfx::CanvasSkiaPaint canvas(event, false); | 1530 gfx::CanvasSkiaPaint canvas(event, false); |
| 1531 gfx::Rect bounding_rect(widget->allocation); | 1531 gfx::Rect bounding_rect(widget->allocation); |
| 1532 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); | 1532 page_action_->PaintBadge(&canvas, bounding_rect, tab_id); |
| 1533 return FALSE; | 1533 return FALSE; |
| 1534 } | 1534 } |
| OLD | NEW |