diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 02:52:53 +0000 |
commit | 6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c (patch) | |
tree | a75584b11b8ef188b4eb3376b9146e063823a916 /chrome/browser/ui/gtk/infobars/infobar_gtk.h | |
parent | bf3ee201c1ca5112f7fd173fc4785aa52920c5c0 (diff) | |
download | chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.zip chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.gz chromium_src-6c2381d5ec28a86536c07dfa4a398a2b6bc1a58c.tar.bz2 |
Move NotificationObserver, NotificationSource, and NotificationDetails to content/public/browser.
This patch got way bigger than I wanted, but once I moved NotificationDetails, I figured I might as well mvoe the others since they're in the same files. In hindsight, I should have converted a subset of files at a time by leaving a using statement in the header.
BUG=98716
TBR=joi
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106196 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/infobars/infobar_gtk.h')
-rw-r--r-- | chrome/browser/ui/gtk/infobars/infobar_gtk.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/ui/gtk/infobars/infobar_gtk.h b/chrome/browser/ui/gtk/infobars/infobar_gtk.h index 5835175..a312ceb 100644 --- a/chrome/browser/ui/gtk/infobars/infobar_gtk.h +++ b/chrome/browser/ui/gtk/infobars/infobar_gtk.h @@ -13,8 +13,8 @@ #include "chrome/browser/infobars/infobar.h" #include "chrome/browser/infobars/infobar_delegate.h" #include "chrome/browser/ui/gtk/menu_gtk.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" #include "third_party/skia/include/core/SkPaint.h" #include "ui/base/gtk/gtk_signal.h" #include "ui/base/gtk/owned_widget_gtk.h" @@ -29,7 +29,7 @@ class MenuModel; } class InfoBarGtk : public InfoBar, - public NotificationObserver { + public content::NotificationObserver { public: InfoBarGtk(InfoBarTabHelper* owner, InfoBarDelegate* delegate); virtual ~InfoBarGtk(); @@ -92,10 +92,10 @@ class InfoBarGtk : public InfoBar, virtual void PlatformSpecificOnCloseSoon() OVERRIDE; virtual void PlatformSpecificOnHeightsRecalculated() OVERRIDE; - // NotificationObserver: + // content::NotificationObserver: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE; + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE; // The second highest widget in the hierarchy (after the |widget_|). GtkWidget* bg_box_; @@ -109,7 +109,7 @@ class InfoBarGtk : public InfoBar, // The theme provider, used for getting border colors. GtkThemeService* theme_service_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; private: CHROMEGTK_CALLBACK_0(InfoBarGtk, void, OnCloseButton); |