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/bubble | |
| 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/bubble')
| -rw-r--r-- | chrome/browser/ui/gtk/bubble/bubble_gtk.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/bubble/bubble_gtk.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc index e962568..cc096a7 100644 --- a/chrome/browser/ui/gtk/bubble/bubble_gtk.cc +++ b/chrome/browser/ui/gtk/bubble/bubble_gtk.cc @@ -10,6 +10,7 @@ #include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.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 "ui/base/gtk/gtk_windowing.h" #include "ui/gfx/gtk_util.h" @@ -179,7 +180,7 @@ void BubbleGtk::Init(GtkWidget* anchor_widget, GrabPointerAndKeyboard(); } - registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, + registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED, Source<ThemeService>(theme_service_)); theme_service_->InitThemesFor(this); } @@ -343,10 +344,10 @@ void BubbleGtk::StackWindow() { ui::StackPopupWindow(window_, GTK_WIDGET(toplevel_window_)); } -void BubbleGtk::Observe(NotificationType type, +void BubbleGtk::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - DCHECK_EQ(type.value, NotificationType::BROWSER_THEME_CHANGED); + DCHECK_EQ(type, chrome::NOTIFICATION_BROWSER_THEME_CHANGED); if (theme_service_->UsingNativeTheme() && match_system_theme_) { gtk_widget_modify_bg(window_, GTK_STATE_NORMAL, NULL); } else { diff --git a/chrome/browser/ui/gtk/bubble/bubble_gtk.h b/chrome/browser/ui/gtk/bubble/bubble_gtk.h index dc7c5a5..b11b45f 100644 --- a/chrome/browser/ui/gtk/bubble/bubble_gtk.h +++ b/chrome/browser/ui/gtk/bubble/bubble_gtk.h @@ -77,7 +77,7 @@ class BubbleGtk : public NotificationObserver { void Close(); // NotificationObserver implementation. - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details) OVERRIDE; |