diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
29 files changed, 208 insertions, 199 deletions
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm index 2bb39d6..168fa71 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm @@ -9,8 +9,8 @@ #include "base/memory/scoped_nsobject.h" #include "base/string_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.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 "content/common/notification_service.h" #include "content/public/browser/notification_types.h" #include "grit/generated_resources.h" @@ -24,23 +24,23 @@ namespace BaseBubbleControllerInternal { // This bridge listens for notifications so that the bubble closes when a user // switches tabs (including by opening a new one). -class Bridge : public NotificationObserver { +class Bridge : public content::NotificationObserver { public: explicit Bridge(BaseBubbleController* controller) : controller_(controller) { registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_HIDDEN, NotificationService::AllSources()); } - // NotificationObserver: + // content::NotificationObserver: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { [controller_ close]; } private: BaseBubbleController* controller_; // Weak, owns this. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; }; } // namespace BaseBubbleControllerInternal diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index 4885054..201f852 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -12,8 +12,8 @@ #import "chrome/browser/ui/cocoa/browser_window_controller.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #include "content/browser/user_metrics.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 "content/common/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -21,16 +21,16 @@ // Simple class to watch for tab creation/destruction and close the bubble. // Bridge between Chrome-style notifications and ObjC-style notifications. -class BookmarkBubbleNotificationBridge : public NotificationObserver { +class BookmarkBubbleNotificationBridge : public content::NotificationObserver { public: BookmarkBubbleNotificationBridge(BookmarkBubbleController* controller, SEL selector); virtual ~BookmarkBubbleNotificationBridge() {} void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; BookmarkBubbleController* controller_; // weak; owns us. SEL selector_; // SEL sent to controller_ on notification. }; @@ -50,8 +50,8 @@ BookmarkBubbleNotificationBridge::BookmarkBubbleNotificationBridge( // away) so we don't bother checking which notification came in. void BookmarkBubbleNotificationBridge::Observe( int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { [controller_ performSelector:selector_ withObject:controller_]; } diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm index a3ea24f..641e2b5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -474,7 +474,7 @@ TEST_F(BookmarkBubbleControllerTest, BubbleGoesAwayOnNewTab) { // creation. See TabContents::NotifyConnected(). NotificationService::current()->Notify( content::NOTIFICATION_TAB_CONTENTS_CONNECTED, - Source<TabContents>(NULL), + content::Source<TabContents>(NULL), NotificationService::NoDetails()); // Confirm bubble going bye-bye. diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm index aab48c7..42192f6 100644 --- a/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm +++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller.mm @@ -36,7 +36,7 @@ namespace AvatarButtonControllerInternal { -class Observer : public NotificationObserver { +class Observer : public content::NotificationObserver { public: Observer(AvatarButtonController* button) : button_(button) { registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED, @@ -45,8 +45,8 @@ class Observer : public NotificationObserver { // NotificationObserver: void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) OVERRIDE { + const content::NotificationSource& source, + const content::NotificationDetails& details) OVERRIDE { switch (type) { case chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED: [button_ updateAvatar]; @@ -59,7 +59,7 @@ class Observer : public NotificationObserver { } private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; AvatarButtonController* button_; // Weak; owns this. }; diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 7d2ba5f..7f60a7a 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -11,7 +11,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/prefs/pref_change_registrar.h" #include "chrome/browser/ui/browser_window.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" #include "ui/base/ui_base_types.h" class Browser; @@ -26,7 +26,7 @@ class Browser; // it needs to manipulate the window. class BrowserWindowCocoa : public BrowserWindow, - public NotificationObserver { + public content::NotificationObserver { public: BrowserWindowCocoa(Browser* browser, BrowserWindowController* controller); @@ -126,8 +126,8 @@ class BrowserWindowCocoa : public BrowserWindow, // Overridden from NotificationObserver virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Adds the given FindBar cocoa controller to this browser window. void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller); @@ -142,7 +142,7 @@ class BrowserWindowCocoa : public BrowserWindow, NSWindow* window() const; // Accessor for the (current) |NSWindow|. void UpdateSidebarForContents(TabContents* tab_contents); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; PrefChangeRegistrar pref_change_registrar_; Browser* browser_; // weak, owned by controller BrowserWindowController* controller_; // weak, owns us diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 6bba6cf..9f15251 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -42,9 +42,9 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_details.h" #include "content/common/notification_service.h" #include "content/public/browser/native_web_keyboard_event.h" +#include "content/public/browser/notification_details.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -75,8 +75,9 @@ BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, : browser_(browser), controller_(controller), confirm_close_factory_(browser) { - registrar_.Add(this, chrome::NOTIFICATION_SIDEBAR_CHANGED, - Source<SidebarManager>(SidebarManager::GetInstance())); + registrar_.Add( + this, chrome::NOTIFICATION_SIDEBAR_CHANGED, + content::Source<SidebarManager>(SidebarManager::GetInstance())); pref_change_registrar_.Init(browser_->profile()->GetPrefs()); pref_change_registrar_.Add(prefs::kShowBookmarkBar, this); @@ -563,8 +564,8 @@ FindBar* BrowserWindowCocoa::CreateFindBar() { } void BrowserWindowCocoa::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_PREF_CHANGED: { const std::string& pref_name = *Details<std::string>(details).ptr(); @@ -574,7 +575,7 @@ void BrowserWindowCocoa::Observe(int type, } case chrome::NOTIFICATION_SIDEBAR_CHANGED: UpdateSidebarForContents( - Details<SidebarContainer>(details)->tab_contents()); + content::Details<SidebarContainer>(details)->tab_contents()); break; default: NOTREACHED(); // we don't ask for anything else! diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm index 756b632..79fbbfb 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm @@ -11,7 +11,7 @@ #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" -#include "content/common/notification_details.h" +#include "content/public/browser/notification_details.h" #include "testing/gtest/include/gtest/gtest.h" // A BrowserWindowCocoa that goes PONG when @@ -27,8 +27,8 @@ class BrowserWindowCocoaPong : public BrowserWindowCocoa { virtual ~BrowserWindowCocoaPong() { } void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_PREF_CHANGED) { const std::string& pref_name = *Details<std::string>(details).ptr(); if (pref_name == prefs::kShowBookmarkBar) diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h index acb636e..64648c8 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h @@ -10,7 +10,7 @@ #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/ui/cocoa/constrained_window_mac.h" #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" @class CollectedCookiesWindowController; @class CookieDetailsViewController; @@ -20,7 +20,7 @@ class TabContentsWrapper; // The constrained window delegate reponsible for managing the collected // cookies dialog. class CollectedCookiesMac : public ConstrainedWindowMacDelegateCustomSheet, - public NotificationObserver { + public content::NotificationObserver { public: CollectedCookiesMac(NSWindow* parent, TabContentsWrapper* wrapper); @@ -34,10 +34,10 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegateCustomSheet, // NotificationObserver implementation. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; ConstrainedWindow* window_; diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index df9c0e2..358fbbf 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -19,8 +19,8 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_details.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" @@ -85,7 +85,7 @@ CollectedCookiesMac::CollectedCookiesMac(NSWindow* parent, @selector(sheetDidEnd:returnCode:contextInfo:)) { TabSpecificContentSettings* content_settings = wrapper->content_settings(); registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, - Source<TabSpecificContentSettings>(content_settings)); + content::Source<TabSpecificContentSettings>(content_settings)); sheet_controller_ = [[CollectedCookiesWindowController alloc] initWithTabContentsWrapper:wrapper]; @@ -108,8 +108,8 @@ void CollectedCookiesMac::DeleteDelegate() { } void CollectedCookiesMac::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { DCHECK(type == chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN); window_->CloseConstrainedWindow(); } diff --git a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm index acadd54..86029cc 100644 --- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm @@ -14,9 +14,9 @@ #include "chrome/browser/tab_contents/tab_contents_view_mac.h" #import "chrome/browser/ui/cocoa/animatable_image.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_details.h" -#include "content/common/notification_registrar.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_registrar.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" @@ -45,7 +45,7 @@ class DownloadAnimationTabObserver; // A helper class to monitor tab hidden and closed notifications. If we receive // such a notification, we stop the animation. -class DownloadAnimationTabObserver : public NotificationObserver { +class DownloadAnimationTabObserver : public content::NotificationObserver { public: DownloadAnimationTabObserver(DownloadStartedAnimationMac* owner, TabContents* tab_contents) @@ -53,17 +53,17 @@ class DownloadAnimationTabObserver : public NotificationObserver { tab_contents_(tab_contents) { registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_HIDDEN, - Source<TabContents>(tab_contents_)); + content::Source<TabContents>(tab_contents_)); registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED, - Source<TabContents>(tab_contents_)); + content::Source<TabContents>(tab_contents_)); } // Runs when a tab is hidden or destroyed. Let our owner know we should end // the animation. void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { // This ends up deleting us. [owner_ closeAnimation]; } @@ -76,7 +76,7 @@ class DownloadAnimationTabObserver : public NotificationObserver { TabContents* tab_contents_; // Used for registering to receive notifications and automatic clean up. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(DownloadAnimationTabObserver); }; diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index f72a087..836262e 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -16,9 +16,9 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" +#include "content/public/browser/notification_source.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #include "ui/gfx/canvas_skia_paint.h" @@ -42,7 +42,7 @@ const CGFloat kAnimationDuration = 0.2; // A helper class to bridge the asynchronous Skia bitmap loading mechanism to // the extension's button. -class ExtensionImageTrackerBridge : public NotificationObserver, +class ExtensionImageTrackerBridge : public content::NotificationObserver, public ImageLoadingTracker::Observer { public: ExtensionImageTrackerBridge(BrowserActionButton* owner, @@ -58,8 +58,9 @@ class ExtensionImageTrackerBridge : public NotificationObserver, Extension::kBrowserActionIconMaxSize), ImageLoadingTracker::DONT_CACHE); } - registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED, - Source<ExtensionAction>(extension->browser_action())); + registrar_.Add( + this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED, + content::Source<ExtensionAction>(extension->browser_action())); } ~ExtensionImageTrackerBridge() {} @@ -72,10 +73,10 @@ class ExtensionImageTrackerBridge : public NotificationObserver, [owner_ updateState]; } - // Overridden from NotificationObserver. + // Overridden from content::NotificationObserver. void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED) [owner_ updateState]; else @@ -90,7 +91,7 @@ class ExtensionImageTrackerBridge : public NotificationObserver, ImageLoadingTracker tracker_; // Used for registering to receive notifications and automatic clean up. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(ExtensionImageTrackerBridge); }; diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 7aedd03..08ea24a 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -26,10 +26,10 @@ #include "chrome/common/extensions/extension_action.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_details.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "grit/theme_resources.h" #include "grit/theme_resources_standard.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" @@ -179,19 +179,19 @@ const CGFloat kBrowserActionBubbleYOffset = 3.0; // A helper class to proxy extension notifications to the view controller's // appropriate methods. -class ExtensionServiceObserverBridge : public NotificationObserver, - public ExtensionToolbarModel::Observer { +class ExtensionServiceObserverBridge : public content::NotificationObserver, + public ExtensionToolbarModel::Observer { public: ExtensionServiceObserverBridge(BrowserActionsController* owner, Profile* profile) : owner_(owner) { registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, - Source<Profile>(profile)); + content::Source<Profile>(profile)); } - // Overridden from NotificationObserver. + // Overridden from content::NotificationObserver. void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: { ExtensionPopupController* popup = [ExtensionPopupController popup]; @@ -221,7 +221,7 @@ class ExtensionServiceObserverBridge : public NotificationObserver, BrowserActionsController* owner_; // Used for registering to receive notifications and automatic clean up. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(ExtensionServiceObserverBridge); }; diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index eb79178..cbaffd2 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -26,9 +26,9 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "content/common/notification_details.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -68,7 +68,7 @@ class AsyncUninstaller : public ExtensionUninstallDialog::Delegate { namespace extension_action_context_menu { -class DevmodeObserver : public NotificationObserver { +class DevmodeObserver : public content::NotificationObserver { public: DevmodeObserver(ExtensionActionContextMenu* menu, PrefService* service) @@ -79,8 +79,8 @@ class DevmodeObserver : public NotificationObserver { virtual ~DevmodeObserver() {} void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_PREF_CHANGED) [menu_ updateInspectorItem]; else @@ -93,24 +93,24 @@ class DevmodeObserver : public NotificationObserver { PrefChangeRegistrar registrar_; }; -class ProfileObserverBridge : public NotificationObserver { +class ProfileObserverBridge : public content::NotificationObserver { public: ProfileObserverBridge(ExtensionActionContextMenu* owner, const Profile* profile) : owner_(owner), profile_(profile) { registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED, - Source<Profile>(profile)); + content::Source<Profile>(profile)); } ~ProfileObserverBridge() {} - // Overridden from NotificationObserver + // Overridden from content::NotificationObserver void Observe(int type, - const NotificationSource& source, + const content::NotificationSource& source, const NotificationDetails& details) { if (type == chrome::NOTIFICATION_PROFILE_DESTROYED && - source == Source<Profile>(profile_)) { + source == content::Source<Profile>(profile_)) { [owner_ invalidateProfile]; } } @@ -118,7 +118,7 @@ class ProfileObserverBridge : public NotificationObserver { private: ExtensionActionContextMenu* owner_; const Profile* profile_; - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; }; } // namespace extension_action_context_menu diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index e0df44e..9a9f324 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -20,9 +20,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" -#include "content/common/notification_details.h" -#include "content/common/notification_registrar.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_registrar.h" +#include "content/public/browser/notification_source.h" #include "grit/generated_resources.h" #import "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" @@ -31,32 +31,35 @@ // C++ class that receives EXTENSION_LOADED notifications and proxies them back // to |controller|. -class ExtensionLoadedNotificationObserver : public NotificationObserver { +class ExtensionLoadedNotificationObserver + : public content::NotificationObserver { public: ExtensionLoadedNotificationObserver( ExtensionInstalledBubbleController* controller, Profile* profile) : controller_(controller) { registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, - Source<Profile>(profile)); + content::Source<Profile>(profile)); registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, - Source<Profile>(profile)); + content::Source<Profile>(profile)); } private: // NotificationObserver implementation. Tells the controller to start showing // its window on the main thread when the extension has finished loading. void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == chrome::NOTIFICATION_EXTENSION_LOADED) { - const Extension* extension = Details<const Extension>(details).ptr(); + const Extension* extension = + content::Details<const Extension>(details).ptr(); if (extension == [controller_ extension]) { [controller_ performSelectorOnMainThread:@selector(showWindow:) withObject:controller_ waitUntilDone:NO]; } } else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) { - const Extension* extension = Details<const Extension>(details).ptr(); + const Extension* extension = + content::Details<const Extension>(details).ptr(); if (extension == [controller_ extension]) { [controller_ performSelectorOnMainThread:@selector(extensionUnloaded:) withObject:controller_ @@ -67,7 +70,7 @@ class ExtensionLoadedNotificationObserver : public NotificationObserver { } } - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; ExtensionInstalledBubbleController* controller_; // weak, owns us }; diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index a42c63e..fec8da0 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -15,9 +15,9 @@ #import "chrome/browser/ui/cocoa/extensions/extension_view_mac.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_details.h" -#include "content/common/notification_registrar.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_registrar.h" +#include "content/public/browser/notification_source.h" namespace { // The duration for any animations that might be invoked by this controller. @@ -34,14 +34,14 @@ CGFloat Clamp(CGFloat value, CGFloat min, CGFloat max) { } // namespace -class DevtoolsNotificationBridge : public NotificationObserver { +class DevtoolsNotificationBridge : public content::NotificationObserver { public: explicit DevtoolsNotificationBridge(ExtensionPopupController* controller) : controller_(controller) {} void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: { if (Details<ExtensionHost>([controller_ extensionHost]) == details) @@ -128,13 +128,13 @@ class DevtoolsNotificationBridge : public NotificationObserver { if (beingInspected_) { // Listen for the the devtools window closing. notificationBridge_.reset(new DevtoolsNotificationBridge(self)); - registrar_.reset(new NotificationRegistrar); + registrar_.reset(new content::NotificationRegistrar); registrar_->Add(notificationBridge_.get(), content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING, - Source<content::BrowserContext>(host->profile())); + content::Source<content::BrowserContext>(host->profile())); registrar_->Add(notificationBridge_.get(), chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, - Source<Profile>(host->profile())); + content::Source<Profile>(host->profile())); } return self; } diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h index f0ae1bd..99bd372 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -18,7 +18,7 @@ #include "chrome/browser/sessions/tab_restore_service_observer.h" #import "chrome/browser/ui/cocoa/main_menu_item.h" #include "content/browser/cancelable_request.h" -#include "content/common/notification_observer.h" +#include "content/public/browser/notification_observer.h" class NavigationEntry; class NotificationRegistrar; @@ -56,7 +56,7 @@ class HistoryMenuBridgeTest; // unlike the typical ownership model, this bridge owns its controller. The // controller is very thin and only exists to interact with Cocoa, but this // class does the bulk of the work. -class HistoryMenuBridge : public NotificationObserver, +class HistoryMenuBridge : public content::NotificationObserver, public TabRestoreServiceObserver, public MainMenuItem { public: @@ -125,10 +125,10 @@ class HistoryMenuBridge : public NotificationObserver, explicit HistoryMenuBridge(Profile* profile); virtual ~HistoryMenuBridge(); - // NotificationObserver: + // content::NotificationObserver: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // TabRestoreServiceObserver: virtual void TabRestoreServiceChanged(TabRestoreService* service); @@ -209,7 +209,7 @@ class HistoryMenuBridge : public NotificationObserver, HistoryService* history_service_; // weak TabRestoreService* tab_restore_service_; // weak - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; CancelableRequestConsumer cancelable_request_consumer_; // Mapping of NSMenuItems to HistoryItems. This owns the HistoryItems until diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 6c54b81..56eae82 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -19,7 +19,7 @@ #import "chrome/browser/ui/cocoa/history_menu_cocoa_controller.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/url_constants.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" #include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -105,7 +105,8 @@ HistoryMenuBridge::HistoryMenuBridge(Profile* profile) // The service is not ready for use yet, so become notified when it does. if (!history_service_) { registrar_.Add( - this, chrome::NOTIFICATION_HISTORY_LOADED, Source<Profile>(profile_)); + this, chrome::NOTIFICATION_HISTORY_LOADED, + content::Source<Profile>(profile_)); } } @@ -117,14 +118,14 @@ HistoryMenuBridge::~HistoryMenuBridge() { DCHECK(profile_); if (history_service_) { registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); } else { registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_LOADED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); } if (tab_restore_service_) @@ -140,8 +141,8 @@ HistoryMenuBridge::~HistoryMenuBridge() { } void HistoryMenuBridge::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { // A history service is now ready. Check to see if it's the one for the main // profile. If so, perform final initialization. if (type == chrome::NOTIFICATION_HISTORY_LOADED) { @@ -154,7 +155,7 @@ void HistoryMenuBridge::Observe(int type, // Found our HistoryService, so stop listening for this notification. registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_LOADED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); } } @@ -368,11 +369,11 @@ NSMenuItem* HistoryMenuBridge::AddItemToMenu(HistoryItem* item, void HistoryMenuBridge::Init() { registrar_.Add(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); } void HistoryMenuBridge::CreateMenu() { diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm index 7514606..044055a 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_nsobject.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 "content/common/notification_service.h" #include "content/public/browser/notification_types.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" @@ -30,17 +30,17 @@ const NSTimeInterval kMinimumTimeInterval = @end // A helper class to proxy app notifications to the window. -class AppNotificationBridge : public NotificationObserver { +class AppNotificationBridge : public content::NotificationObserver { public: explicit AppNotificationBridge(InfoBubbleWindow* owner) : owner_(owner) { registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING, NotificationService::AllSources()); } - // Overridden from NotificationObserver. + // Overridden from content::NotificationObserver. void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case content::NOTIFICATION_APP_TERMINATING: [owner_ appIsTerminating]; @@ -55,7 +55,7 @@ class AppNotificationBridge : public NotificationObserver { InfoBubbleWindow* owner_; // Used for registering to receive notifications and automatic clean up. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(AppNotificationBridge); }; diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h index ed77111..00da833 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.h @@ -11,7 +11,7 @@ #include "base/memory/scoped_nsobject.h" #include "base/memory/scoped_ptr.h" #import "chrome/browser/ui/cocoa/view_resizer.h" -#include "content/common/notification_registrar.h" +#include "content/public/browser/notification_registrar.h" @class BrowserWindowController; @class InfoBarController; @@ -64,7 +64,7 @@ const CGFloat kTipHeight = 12.0; // Lets us registers for INFOBAR_ADDED/INFOBAR_REMOVED // notifications. The actual notifications are sent to the // InfoBarNotificationObserver object, which proxies them back to us. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; scoped_ptr<InfoBarNotificationObserver> infoBarObserver_; } diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm index 7f2483d..7d9adab 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm @@ -14,13 +14,13 @@ #import "chrome/browser/ui/cocoa/view_id_util.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" -#include "content/common/notification_details.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "skia/ext/skia_utils_mac.h" // C++ class that receives INFOBAR_ADDED and INFOBAR_REMOVED // notifications and proxies them back to |controller|. -class InfoBarNotificationObserver : public NotificationObserver { +class InfoBarNotificationObserver : public content::NotificationObserver { public: InfoBarNotificationObserver(InfoBarContainerController* controller) : controller_(controller) { @@ -29,9 +29,10 @@ class InfoBarNotificationObserver : public NotificationObserver { private: // NotificationObserver implementation void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { - InfoBarTabHelper* infobar_helper = Source<InfoBarTabHelper>(source).ptr(); + const content::NotificationSource& source, + const content::NotificationDetails& details) { + InfoBarTabHelper* infobar_helper = + content::Source<InfoBarTabHelper>(source).ptr(); switch (type) { case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED: [controller_ addInfoBar:Details<InfoBarAddedDetails>(details)-> @@ -41,7 +42,7 @@ class InfoBarNotificationObserver : public NotificationObserver { case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: { InfoBarRemovedDetails* removed_details = - Details<InfoBarRemovedDetails>(details).ptr(); + content::Details<InfoBarRemovedDetails>(details).ptr(); [controller_ closeInfoBarsForDelegate:removed_details->first animate:(removed_details->second ? YES : NO)]; @@ -50,7 +51,7 @@ class InfoBarNotificationObserver : public NotificationObserver { case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED: { InfoBarReplacedDetails* replaced_details = - Details<InfoBarReplacedDetails>(details).ptr(); + content::Details<InfoBarReplacedDetails>(details).ptr(); [controller_ closeInfoBarsForDelegate:replaced_details->first animate:NO]; [controller_ addInfoBar:replaced_details->second-> @@ -148,7 +149,7 @@ class InfoBarNotificationObserver : public NotificationObserver { [self addInfoBar:infobar animate:NO]; } - Source<InfoBarTabHelper> source(infobar_helper); + content::Source<InfoBarTabHelper> source(infobar_helper); registrar_.Add(infoBarObserver_.get(), chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, source); registrar_.Add(infoBarObserver_.get(), diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h index 35141d4..0b7f7ca 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h @@ -45,7 +45,7 @@ class ToolbarModel; class LocationBarViewMac : public AutocompleteEditController, public LocationBar, public LocationBarTesting, - public NotificationObserver { + public content::NotificationObserver { public: LocationBarViewMac(AutocompleteTextField* field, CommandUpdater* command_updater, @@ -149,8 +149,8 @@ class LocationBarViewMac : public AutocompleteEditController, // Overridden from NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); private: // Posts |notification| to the default notification center. @@ -221,7 +221,7 @@ class LocationBarViewMac : public AutocompleteEditController, content::PageTransition transition_; // Used to register for notifications received by NotificationObserver. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; // Used to schedule a task for the first run info bubble. base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_; diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index a8f5092..33e5d0d 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -186,7 +186,7 @@ void LocationBarViewMac::UpdatePageActions() { if (page_action_decorations_.size() != count_before) { NotificationService::current()->Notify( chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED, - Source<LocationBar>(this), + content::Source<LocationBar>(this), NotificationService::NoDetails()); } } @@ -198,7 +198,7 @@ void LocationBarViewMac::InvalidatePageActions() { if (page_action_decorations_.size() != count_before) { NotificationService::current()->Notify( chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED, - Source<LocationBar>(this), + content::Source<LocationBar>(this), NotificationService::NoDetails()); } } @@ -480,8 +480,8 @@ NSImage* LocationBarViewMac::GetKeywordImage(const string16& keyword) { } void LocationBarViewMac::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: { TabContents* contents = GetTabContents(); diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h index 39bb38c..8325a60 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h @@ -21,7 +21,7 @@ class TabContents; class PageActionDecoration : public ImageDecoration, public ImageLoadingTracker::Observer, - public NotificationObserver { + public content::NotificationObserver { public: PageActionDecoration(LocationBarViewMac* owner, Profile* profile, @@ -60,8 +60,8 @@ class PageActionDecoration : public ImageDecoration, private: // Overridden from NotificationObserver: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // The location bar view that owns us. LocationBarViewMac* owner_; @@ -102,7 +102,7 @@ class PageActionDecoration : public ImageDecoration, // Used to register for notifications received by // NotificationObserver. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; DISALLOW_COPY_AND_ASSIGN(PageActionDecoration); }; diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm index 40425f1..00c19b9 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm @@ -61,7 +61,7 @@ PageActionDecoration::PageActionDecoration( } registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, - Source<Profile>(profile_)); + content::Source<Profile>(profile_)); // We set the owner last of all so that we can determine whether we are in // the process of initializing this class or not. @@ -188,8 +188,8 @@ void PageActionDecoration::UpdateVisibility(TabContents* contents, SetVisible(visible); NotificationService::current()->Notify( chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, - Source<ExtensionAction>(page_action_), - Details<TabContents>(contents)); + content::Source<ExtensionAction>(page_action_), + content::Details<TabContents>(contents)); } } @@ -242,8 +242,8 @@ NSMenu* PageActionDecoration::GetMenu() { void PageActionDecoration::Observe( int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: { ExtensionPopupController* popup = [ExtensionPopupController popup]; diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm index 8d4db4a..db10dc9 100644 --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm @@ -9,10 +9,10 @@ #include "content/browser/renderer_host/render_widget_host_view.h" #include "content/browser/tab_contents/navigation_controller.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_details.h" -#include "content/common/notification_observer.h" -#include "content/common/notification_registrar.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_observer.h" +#include "content/public/browser/notification_registrar.h" +#include "content/public/browser/notification_details.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" @interface TabContentsController(Private) @@ -26,18 +26,18 @@ // A supporting C++ bridge object to register for TabContents notifications. -class TabContentsNotificationBridge : public NotificationObserver { +class TabContentsNotificationBridge : public content::NotificationObserver { public: explicit TabContentsNotificationBridge(TabContentsController* controller); - // Overriden from NotificationObserver. + // Overriden from content::NotificationObserver. virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Register for |contents|'s notifications, remove all prior registrations. void ChangeTabContents(TabContents* contents); private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; TabContentsController* controller_; // weak, owns us }; @@ -48,11 +48,11 @@ TabContentsNotificationBridge::TabContentsNotificationBridge( void TabContentsNotificationBridge::Observe( int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) { RenderViewHostSwitchedDetails* switched_details = - Details<RenderViewHostSwitchedDetails>(details).ptr(); + content::Details<RenderViewHostSwitchedDetails>(details).ptr(); [controller_ tabContentsRenderViewHostChanged:switched_details->old_host newHost:switched_details->new_host]; } else { @@ -63,9 +63,10 @@ void TabContentsNotificationBridge::Observe( void TabContentsNotificationBridge::ChangeTabContents(TabContents* contents) { registrar_.RemoveAll(); if (contents) { - registrar_.Add(this, - content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, - Source<NavigationController>(&contents->controller())); + registrar_.Add( + this, + content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, + content::Source<NavigationController>(&contents->controller())); } } diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.h b/chrome/browser/ui/cocoa/theme_install_bubble_view.h index 83f2cc2..8d1c9ec 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.h +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.h @@ -6,8 +6,8 @@ #define CHROME_BROWSER_UI_COCOA_THEME_INSTALL_BUBBLE_VIEW_H_ #pragma once -#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" @class NSWindow; @class ThemeInstallBubbleViewCocoa; @@ -25,14 +25,14 @@ // between install begin and theme caching seizing the UI thread), the loading // bubble will only appear over the first window, as there is only ever one // instance of the bubble. -class ThemeInstallBubbleView : public NotificationObserver { +class ThemeInstallBubbleView : public content::NotificationObserver { public: virtual ~ThemeInstallBubbleView(); - // NotificationObserver + // content::NotificationObserver virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details); + const content::NotificationSource& source, + const content::NotificationDetails& details); // Show the loading bubble. static void Show(NSWindow* window); @@ -44,7 +44,7 @@ class ThemeInstallBubbleView : public NotificationObserver { static ThemeInstallBubbleView* view_; // A scoped container for notification registries. - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; // Shut down the popup and remove our notifications. void Close(); diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm index bd23add..60d433e 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm @@ -113,9 +113,10 @@ void ThemeInstallBubbleView::Close() { } } -void ThemeInstallBubbleView::Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { +void ThemeInstallBubbleView::Observe( + int type, + const content::NotificationSource& source, + const content::NotificationDetails& details) { Close(); } diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 150b69e..b9d2a8c 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -48,9 +48,9 @@ #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" -#include "content/common/notification_details.h" -#include "content/common/notification_observer.h" +#include "content/public/browser/notification_observer.h" #include "content/common/notification_service.h" +#include "content/public/browser/notification_details.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -99,20 +99,20 @@ namespace ToolbarControllerInternal { // A class registered for C++ notifications. This is used to detect changes in // preferences and upgrade available notifications. Bridges the notification // back to the ToolbarController. -class NotificationBridge : public NotificationObserver { +class NotificationBridge : public content::NotificationObserver { public: explicit NotificationBridge(ToolbarController* controller) : controller_(controller) { registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED, NotificationService::AllSources()); registrar_.Add(this, chrome::NOTIFICATION_GLOBAL_ERRORS_CHANGED, - Source<Profile>([controller browser]->profile())); + content::Source<Profile>([controller browser]->profile())); } - // Overridden from NotificationObserver: + // Overridden from content::NotificationObserver: virtual void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { switch (type) { case chrome::NOTIFICATION_PREF_CHANGED: [controller_ prefChanged:Details<std::string>(details).ptr()]; @@ -129,7 +129,7 @@ class NotificationBridge : public NotificationObserver { private: ToolbarController* controller_; // weak, owns us - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; }; } // namespace ToolbarControllerInternal diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm index 928447a..c993587 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -20,9 +20,9 @@ #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/browser/profiles/profile.h" #include "content/browser/user_metrics.h" -#include "content/common/notification_observer.h" +#include "content/public/browser/notification_observer.h" #include "content/common/notification_service.h" -#include "content/common/notification_source.h" +#include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" @@ -60,7 +60,7 @@ class AcceleratorDelegate : public ui::AcceleratorProvider { } }; -class ZoomLevelObserver : public NotificationObserver { +class ZoomLevelObserver : public content::NotificationObserver { public: explicit ZoomLevelObserver(WrenchMenuController* controller) : controller_(controller) { @@ -69,12 +69,12 @@ class ZoomLevelObserver : public NotificationObserver { } void Observe(int type, - const NotificationSource& source, - const NotificationDetails& details) { + const content::NotificationSource& source, + const content::NotificationDetails& details) { DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED); WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel]; if (wrenchMenuModel->browser()->profile()->GetHostZoomMap() != - Source<HostZoomMap>(source).ptr()) { + content::Source<HostZoomMap>(source).ptr()) { return; } @@ -85,7 +85,7 @@ class ZoomLevelObserver : public NotificationObserver { } private: - NotificationRegistrar registrar_; + content::NotificationRegistrar registrar_; WrenchMenuController* controller_; // Weak; owns this. }; |