| OLD | NEW | 
|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/gtk/location_bar_view_gtk.h" | 5 #include "chrome/browser/ui/gtk/location_bar_view_gtk.h" | 
| 6 | 6 | 
| 7 #include <algorithm> | 7 #include <algorithm> | 
| 8 #include <string> | 8 #include <string> | 
| 9 #include <vector> | 9 #include <vector> | 
| 10 | 10 | 
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 47 #include "chrome/common/chrome_switches.h" | 47 #include "chrome/common/chrome_switches.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/pref_names.h" | 51 #include "chrome/common/pref_names.h" | 
| 52 #include "content/browser/tab_contents/tab_contents.h" | 52 #include "content/browser/tab_contents/tab_contents.h" | 
| 53 #include "content/common/notification_service.h" | 53 #include "content/common/notification_service.h" | 
| 54 #include "content/common/page_transition_types.h" | 54 #include "content/common/page_transition_types.h" | 
| 55 #include "grit/generated_resources.h" | 55 #include "grit/generated_resources.h" | 
| 56 #include "grit/theme_resources.h" | 56 #include "grit/theme_resources.h" | 
|  | 57 #include "grit/theme_resources_standard.h" | 
| 57 #include "net/base/net_util.h" | 58 #include "net/base/net_util.h" | 
| 58 #include "ui/base/dragdrop/gtk_dnd_util.h" | 59 #include "ui/base/dragdrop/gtk_dnd_util.h" | 
| 59 #include "ui/base/l10n/l10n_util.h" | 60 #include "ui/base/l10n/l10n_util.h" | 
| 60 #include "ui/base/resource/resource_bundle.h" | 61 #include "ui/base/resource/resource_bundle.h" | 
| 61 #include "ui/gfx/canvas_skia_paint.h" | 62 #include "ui/gfx/canvas_skia_paint.h" | 
| 62 #include "ui/gfx/font.h" | 63 #include "ui/gfx/font.h" | 
| 63 #include "ui/gfx/gtk_util.h" | 64 #include "ui/gfx/gtk_util.h" | 
| 64 #include "webkit/glue/window_open_disposition.h" | 65 #include "webkit/glue/window_open_disposition.h" | 
| 65 | 66 | 
| 66 namespace { | 67 namespace { | 
| (...skipping 1567 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1634 | 1635 | 
| 1635   std::string badge_text = page_action_->GetBadgeText(tab_id); | 1636   std::string badge_text = page_action_->GetBadgeText(tab_id); | 
| 1636   if (badge_text.empty()) | 1637   if (badge_text.empty()) | 
| 1637     return FALSE; | 1638     return FALSE; | 
| 1638 | 1639 | 
| 1639   gfx::CanvasSkiaPaint canvas(event, false); | 1640   gfx::CanvasSkiaPaint canvas(event, false); | 
| 1640   gfx::Rect bounding_rect(widget->allocation); | 1641   gfx::Rect bounding_rect(widget->allocation); | 
| 1641   page_action_->PaintBadge(&canvas, bounding_rect, tab_id); | 1642   page_action_->PaintBadge(&canvas, bounding_rect, tab_id); | 
| 1642   return FALSE; | 1643   return FALSE; | 
| 1643 } | 1644 } | 
| OLD | NEW | 
|---|