diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 15:52:27 +0000 |
commit | 43211582b1fa8c69136385250e7b0446cf364b5c (patch) | |
tree | 655ab01543012b6fd5699dee8fab92876959b7d9 /chrome/browser/ui/gtk/custom_button.cc | |
parent | d43970a7ceee5fc5433787b0f28b64234a4039f2 (diff) | |
download | chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.zip chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.gz chromium_src-43211582b1fa8c69136385250e7b0446cf364b5c.tar.bz2 |
Moving notification types which are chrome specific to a new header file chrome_notification_types.h.
This file lives in chrome\common. The chrome specific notifications start from NOTIFICATION_CONTENT_END
which defines the end of the enum used by content to define notification types. The notificaton_type.h file
in content\common has been renamed to content_notification_types.h
BUG=76698
Review URL: http://codereview.chromium.org/7327007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91972 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/custom_button.cc')
-rw-r--r-- | chrome/browser/ui/gtk/custom_button.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chrome/browser/ui/gtk/custom_button.cc b/chrome/browser/ui/gtk/custom_button.cc index 9cd2d98..a92abc5 100644 --- a/chrome/browser/ui/gtk/custom_button.cc +++ b/chrome/browser/ui/gtk/custom_button.cc @@ -9,6 +9,7 @@ #include "chrome/browser/ui/gtk/gtk_chrome_button.h" #include "chrome/browser/ui/gtk/gtk_theme_service.h" #include "chrome/browser/ui/gtk/gtk_util.h" +#include "chrome/common/chrome_notification_types.h" #include "content/common/notification_service.h" #include "grit/theme_resources_standard.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -39,7 +40,7 @@ CustomDrawButtonBase::CustomDrawButtonBase(GtkThemeService* theme_provider, theme_provider->InitThemesFor(this); registrar_.Add(this, - NotificationType::BROWSER_THEME_CHANGED, + chrome::NOTIFICATION_BROWSER_THEME_CHANGED, NotificationService::AllSources()); } else { // Load the button images from the resource bundle. @@ -140,10 +141,10 @@ void CustomDrawButtonBase::SetBackground(SkColor color, } } -void CustomDrawButtonBase::Observe(NotificationType type, +void CustomDrawButtonBase::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { DCHECK(theme_service_); - DCHECK(NotificationType::BROWSER_THEME_CHANGED == type); + DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type); surfaces_[GTK_STATE_NORMAL]->UsePixbuf(normal_id_ ? theme_service_->GetRTLEnabledPixbufNamed(normal_id_) : NULL); @@ -244,7 +245,7 @@ CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider, theme_service_->InitThemesFor(this); registrar_.Add(this, - NotificationType::BROWSER_THEME_CHANGED, + chrome::NOTIFICATION_BROWSER_THEME_CHANGED, NotificationService::AllSources()); } @@ -262,7 +263,7 @@ CustomDrawButton::CustomDrawButton(GtkThemeService* theme_provider, theme_service_->InitThemesFor(this); registrar_.Add(this, - NotificationType::BROWSER_THEME_CHANGED, + chrome::NOTIFICATION_BROWSER_THEME_CHANGED, NotificationService::AllSources()); } @@ -279,9 +280,9 @@ void CustomDrawButton::Init() { hover_controller_.Init(widget()); } -void CustomDrawButton::Observe(NotificationType type, +void CustomDrawButton::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - DCHECK(NotificationType::BROWSER_THEME_CHANGED == type); + DCHECK(chrome::NOTIFICATION_BROWSER_THEME_CHANGED == type); SetBrowserTheme(); } |