diff options
Diffstat (limited to 'chrome/browser/ui/cocoa')
27 files changed, 124 insertions, 111 deletions
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm index 7b1f247..73c5911 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm @@ -9,10 +9,10 @@ #include "base/memory/scoped_nsobject.h" #include "base/string_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" +#include "content/common/content_notification_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" -#include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -27,12 +27,12 @@ namespace BaseBubbleControllerInternal { class Bridge : public NotificationObserver { public: explicit Bridge(BaseBubbleController* controller) : controller_(controller) { - registrar_.Add(this, NotificationType::TAB_CONTENTS_HIDDEN, + registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_HIDDEN, NotificationService::AllSources()); } // NotificationObserver: - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { [controller_ close]; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index 6797dfb..724283c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -26,7 +26,7 @@ class BookmarkBubbleNotificationBridge : public NotificationObserver { BookmarkBubbleNotificationBridge(BookmarkBubbleController* controller, SEL selector); virtual ~BookmarkBubbleNotificationBridge() {} - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details); private: @@ -40,16 +40,16 @@ BookmarkBubbleNotificationBridge::BookmarkBubbleNotificationBridge( : controller_(controller), selector_(selector) { // registrar_ will automatically RemoveAll() when destroyed so we // don't need to do so explicitly. - registrar_.Add(this, NotificationType::TAB_CONTENTS_CONNECTED, + registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_CONNECTED, NotificationService::AllSources()); - registrar_.Add(this, NotificationType::TAB_CLOSED, + registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED, NotificationService::AllSources()); } // At this time all notifications instigate the same behavior (go // away) so we don't bother checking which notification came in. void BookmarkBubbleNotificationBridge::Observe( - NotificationType type, + int type, const NotificationSource& source, const 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 263a441..73e574c 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm @@ -475,7 +475,7 @@ TEST_F(BookmarkBubbleControllerTest, BubbleGoesAwayOnNewTab) { // we fake the notification that would be triggered by a tab // creation. See TabContents::NotifyConnected(). NotificationService::current()->Notify( - NotificationType::TAB_CONTENTS_CONNECTED, + content::NOTIFICATION_TAB_CONTENTS_CONNECTED, Source<TabContents>(NULL), NotificationService::NoDetails()); diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h index 7de0b9f..c9b34f7 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.h +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h @@ -115,7 +115,7 @@ class BrowserWindowCocoa : public BrowserWindow, const gfx::Rect& bounds); // Overridden from NotificationObserver - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 8f3cc61..f9cd26f 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -35,6 +35,7 @@ #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" #include "content/common/native_web_keyboard_event.h" @@ -51,9 +52,10 @@ BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, controller_(controller), confirm_close_factory_(browser) { // This pref applies to all windows, so all must watch for it. - registrar_.Add(this, NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, + registrar_.Add(this, + chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED, NotificationService::AllSources()); - registrar_.Add(this, NotificationType::SIDEBAR_CHANGED, + registrar_.Add(this, chrome::NOTIFICATION_SIDEBAR_CHANGED, NotificationService::AllSources()); } @@ -583,16 +585,16 @@ WindowOpenDisposition BrowserWindowCocoa::GetDispositionForPopupBounds( return NEW_POPUP; } -void BrowserWindowCocoa::Observe(NotificationType type, +void BrowserWindowCocoa::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { + switch (type) { // Only the key window gets a direct toggle from the menu. // Other windows hear about it from the notification. - case NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED: + case chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED: [controller_ updateBookmarkBarVisibilityWithAnimation:YES]; break; - case NotificationType::SIDEBAR_CHANGED: + case chrome::NOTIFICATION_SIDEBAR_CHANGED: UpdateSidebarForContents( Details<SidebarContainer>(details)->tab_contents()); break; diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm index a68af29..3348a5b 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm @@ -10,7 +10,7 @@ #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" #include "chrome/browser/ui/cocoa/browser_window_controller.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "content/common/notification_type.h" +#include "chrome/common/chrome_notification_types.h" #include "testing/gtest/include/gtest/gtest.h" // A BrowserWindowCocoa that goes PONG when @@ -25,10 +25,10 @@ class BrowserWindowCocoaPong : public BrowserWindowCocoa { } virtual ~BrowserWindowCocoaPong() { } - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - if (type.value == NotificationType::BOOKMARK_BAR_VISIBILITY_PREF_CHANGED) + if (type == chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED) pong_ = true; BrowserWindowCocoa::Observe(type, source, details); } 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 eda63ae..3151800 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h @@ -33,7 +33,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegateCustomSheet, virtual ~CollectedCookiesMac(); // NotificationObserver implementation. - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); 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 9412aae..b9490e2 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -15,6 +15,7 @@ #import "chrome/browser/ui/cocoa/vertical_gradient_view.h" #include "chrome/browser/ui/collected_cookies_infobar_delegate.h" #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" @@ -84,7 +85,7 @@ CollectedCookiesMac::CollectedCookiesMac(NSWindow* parent, TabSpecificContentSettings* content_settings = TabContentsWrapper::GetCurrentWrapperForContents(tab_contents)-> content_settings(); - registrar_.Add(this, NotificationType::COLLECTED_COOKIES_SHOWN, + registrar_.Add(this, chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN, Source<TabSpecificContentSettings>(content_settings)); sheet_controller_ = [[CollectedCookiesWindowController alloc] @@ -107,10 +108,10 @@ void CollectedCookiesMac::DeleteDelegate() { delete this; } -void CollectedCookiesMac::Observe(NotificationType type, +void CollectedCookiesMac::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - DCHECK(type == NotificationType::COLLECTED_COOKIES_SHOWN); + 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 0165cf5..9404e4b 100644 --- a/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm +++ b/chrome/browser/ui/cocoa/download/download_started_animation_mac.mm @@ -51,16 +51,16 @@ class DownloadAnimationTabObserver : public NotificationObserver { : owner_(owner), tab_contents_(tab_contents) { registrar_.Add(this, - NotificationType::TAB_CONTENTS_HIDDEN, + content::NOTIFICATION_TAB_CONTENTS_HIDDEN, Source<TabContents>(tab_contents_)); registrar_.Add(this, - NotificationType::TAB_CONTENTS_DESTROYED, + content::NOTIFICATION_TAB_CONTENTS_DESTROYED, Source<TabContents>(tab_contents_)); } // Runs when a tab is hidden or destroyed. Let our owner know we should end // the animation. - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { // This ends up deleting us. diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index 19b4dcb..f72a087 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -12,13 +12,13 @@ #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" #import "chrome/browser/ui/cocoa/image_utils.h" +#include "chrome/common/chrome_notification_types.h" #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/common/notification_type.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #include "ui/gfx/canvas_skia_paint.h" @@ -58,7 +58,7 @@ class ExtensionImageTrackerBridge : public NotificationObserver, Extension::kBrowserActionIconMaxSize), ImageLoadingTracker::DONT_CACHE); } - registrar_.Add(this, NotificationType::EXTENSION_BROWSER_ACTION_UPDATED, + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED, Source<ExtensionAction>(extension->browser_action())); } @@ -73,10 +73,10 @@ class ExtensionImageTrackerBridge : public NotificationObserver, } // Overridden from NotificationObserver. - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::EXTENSION_BROWSER_ACTION_UPDATED) + if (type == chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED) [owner_ updateState]; else NOTREACHED(); diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm index 342c59c..7aedd03 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm @@ -22,6 +22,7 @@ #import "chrome/browser/ui/cocoa/image_button_cell.h" #import "chrome/browser/ui/cocoa/menu_button.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/pref_names.h" #include "content/browser/tab_contents/tab_contents.h" @@ -183,16 +184,16 @@ class ExtensionServiceObserverBridge : public NotificationObserver, public: ExtensionServiceObserverBridge(BrowserActionsController* owner, Profile* profile) : owner_(owner) { - registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE, + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, Source<Profile>(profile)); } // Overridden from NotificationObserver. - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: { + switch (type) { + case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: { ExtensionPopupController* popup = [ExtensionPopupController popup]; if (popup && ![popup isClosing]) [popup close]; 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 9168ff9..01c8378 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -20,6 +20,7 @@ #include "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_constants.h" @@ -28,7 +29,6 @@ #include "content/common/notification_details.h" #include "content/common/notification_observer.h" #include "content/common/notification_source.h" -#include "content/common/notification_type.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -77,10 +77,10 @@ class DevmodeObserver : public NotificationObserver { } virtual ~DevmodeObserver() {} - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::PREF_CHANGED) + if (type == chrome::NOTIFICATION_PREF_CHANGED) [menu_ updateInspectorItem]; else NOTREACHED(); @@ -98,17 +98,17 @@ class ProfileObserverBridge : public NotificationObserver { const Profile* profile) : owner_(owner), profile_(profile) { - registrar_.Add(this, NotificationType::PROFILE_DESTROYED, + registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED, Source<Profile>(profile)); } ~ProfileObserverBridge() {} // Overridden from NotificationObserver - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::PROFILE_DESTROYED && + if (type == chrome::NOTIFICATION_PROFILE_DESTROYED && source == Source<Profile>(profile_)) { [owner_ invalidateProfile]; } 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 01016804..6099ccf 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -17,6 +17,7 @@ #include "chrome/browser/ui/cocoa/info_bubble_view.h" #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" +#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" @@ -35,26 +36,26 @@ class ExtensionLoadedNotificationObserver : public NotificationObserver { ExtensionLoadedNotificationObserver( ExtensionInstalledBubbleController* controller, Profile* profile) : controller_(controller) { - registrar_.Add(this, NotificationType::EXTENSION_LOADED, + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, Source<Profile>(profile)); - registrar_.Add(this, NotificationType::EXTENSION_UNLOADED, + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED, 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(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::EXTENSION_LOADED) { + if (type == chrome::NOTIFICATION_EXTENSION_LOADED) { const Extension* extension = Details<const Extension>(details).ptr(); if (extension == [controller_ extension]) { [controller_ performSelectorOnMainThread:@selector(showWindow:) withObject:controller_ waitUntilDone:NO]; } - } else if (type == NotificationType::EXTENSION_UNLOADED) { + } else if (type == chrome::NOTIFICATION_EXTENSION_UNLOADED) { const Extension* extension = Details<const Extension>(details).ptr(); if (extension == [controller_ extension]) { [controller_ performSelectorOnMainThread:@selector(extensionUnloaded:) diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 65fda6a..17899e5 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -13,6 +13,7 @@ #import "chrome/browser/ui/cocoa/browser_window_cocoa.h" #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/browser/debugger/devtools_window.h" #include "content/common/notification_details.h" #include "content/common/notification_registrar.h" @@ -38,16 +39,16 @@ class DevtoolsNotificationBridge : public NotificationObserver { explicit DevtoolsNotificationBridge(ExtensionPopupController* controller) : controller_(controller) {} - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::EXTENSION_HOST_DID_STOP_LOADING: { + switch (type) { + case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: { if (Details<ExtensionHost>([controller_ extensionHost]) == details) [controller_ showDevTools]; break; } - case NotificationType::DEVTOOLS_WINDOW_CLOSING: { + case content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING: { RenderViewHost* rvh = [controller_ extensionHost]->render_view_host(); if (Details<RenderViewHost>(rvh) == details) // Allow the devtools to finish detaching before we close the popup @@ -131,10 +132,10 @@ class DevtoolsNotificationBridge : public NotificationObserver { notificationBridge_.reset(new DevtoolsNotificationBridge(self)); registrar_.reset(new NotificationRegistrar); registrar_->Add(notificationBridge_.get(), - NotificationType::DEVTOOLS_WINDOW_CLOSING, + chrome::DEVTOOLS_WINDOW_CLOSING, Source<Profile>(host->profile())); registrar_->Add(notificationBridge_.get(), - NotificationType::EXTENSION_HOST_DID_STOP_LOADING, + chrome::EXTENSION_HOST_DID_STOP_LOADING, 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 e11768c..f0ae1bd 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.h +++ b/chrome/browser/ui/cocoa/history_menu_bridge.h @@ -126,7 +126,7 @@ class HistoryMenuBridge : public NotificationObserver, virtual ~HistoryMenuBridge(); // NotificationObserver: - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 80798b6..f3c5490 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -16,6 +16,7 @@ #include "chrome/browser/sessions/session_types.h" #include "chrome/browser/sessions/tab_restore_service_factory.h" #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/common/notification_service.h" @@ -103,7 +104,7 @@ HistoryMenuBridge::HistoryMenuBridge(Profile* profile) // The service is not ready for use yet, so become notified when it does. if (!history_service_) { registrar_.Add( - this, NotificationType::HISTORY_LOADED, Source<Profile>(profile_)); + this, chrome::NOTIFICATION_HISTORY_LOADED, Source<Profile>(profile_)); } } @@ -114,12 +115,13 @@ HistoryMenuBridge::~HistoryMenuBridge() { // Unregister ourselves as observers and notifications. if (history_service_) { const NotificationSource& src = NotificationService::AllSources(); - registrar_.Remove(this, NotificationType::HISTORY_TYPED_URLS_MODIFIED, src); - registrar_.Remove(this, NotificationType::HISTORY_URL_VISITED, src); - registrar_.Remove(this, NotificationType::HISTORY_URLS_DELETED, src); + registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, + src); + registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, src); + registrar_.Remove(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, src); } else { registrar_.Remove( - this, NotificationType::HISTORY_LOADED, Source<Profile>(profile_)); + this, chrome::NOTIFICATION_HISTORY_LOADED, Source<Profile>(profile_)); } if (tab_restore_service_) @@ -134,12 +136,12 @@ HistoryMenuBridge::~HistoryMenuBridge() { } } -void HistoryMenuBridge::Observe(NotificationType type, +void HistoryMenuBridge::Observe(int type, const NotificationSource& source, const 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 == NotificationType::HISTORY_LOADED) { + if (type == chrome::NOTIFICATION_HISTORY_LOADED) { HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS); if (hs != NULL && hs->BackendLoaded()) { @@ -148,7 +150,7 @@ void HistoryMenuBridge::Observe(NotificationType type, // Found our HistoryService, so stop listening for this notification. registrar_.Remove(this, - NotificationType::HISTORY_LOADED, + chrome::NOTIFICATION_HISTORY_LOADED, Source<Profile>(profile_)); } } @@ -363,9 +365,10 @@ NSMenuItem* HistoryMenuBridge::AddItemToMenu(HistoryItem* item, void HistoryMenuBridge::Init() { const NotificationSource& source = NotificationService::AllSources(); - registrar_.Add(this, NotificationType::HISTORY_TYPED_URLS_MODIFIED, source); - registrar_.Add(this, NotificationType::HISTORY_URL_VISITED, source); - registrar_.Add(this, NotificationType::HISTORY_URLS_DELETED, source); + registrar_.Add(this, chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, + source); + registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED, source); + registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED, source); } void HistoryMenuBridge::CreateMenu() { diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm index dd28438..6c83bc3 100644 --- a/chrome/browser/ui/cocoa/info_bubble_window.mm +++ b/chrome/browser/ui/cocoa/info_bubble_window.mm @@ -7,10 +7,10 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/memory/scoped_nsobject.h" +#include "content/common/content_notification_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_registrar.h" #include "content/common/notification_service.h" -#include "content/common/notification_type.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" namespace { @@ -33,16 +33,16 @@ const NSTimeInterval kMinimumTimeInterval = class AppNotificationBridge : public NotificationObserver { public: explicit AppNotificationBridge(InfoBubbleWindow* owner) : owner_(owner) { - registrar_.Add(this, NotificationType::APP_TERMINATING, + registrar_.Add(this, chrome::NOTIFICATION_APP_TERMINATING, NotificationService::AllSources()); } // Overridden from NotificationObserver. - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::APP_TERMINATING: + switch (type) { + case chrome::NOTIFICATION_APP_TERMINATING: [owner_ appIsTerminating]; break; default: diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm index 3660bca..5c73468 100644 --- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm +++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller.mm @@ -11,6 +11,7 @@ #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" #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 "skia/ext/skia_utils_mac.h" @@ -25,18 +26,18 @@ class InfoBarNotificationObserver : public NotificationObserver { private: // NotificationObserver implementation - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { TabContentsWrapper* tab_contents = Source<TabContentsWrapper>(source).ptr(); - switch (type.value) { - case NotificationType::TAB_CONTENTS_INFOBAR_ADDED: + switch (type) { + case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED: [controller_ addInfoBar:Details<InfoBarAddedDetails>(details)-> CreateInfoBar(tab_contents) animate:YES]; break; - case NotificationType::TAB_CONTENTS_INFOBAR_REMOVED: { + case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED: { InfoBarRemovedDetails* removed_details = Details<InfoBarRemovedDetails>(details).ptr(); [controller_ @@ -45,7 +46,7 @@ class InfoBarNotificationObserver : public NotificationObserver { break; } - case NotificationType::TAB_CONTENTS_INFOBAR_REPLACED: { + case chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED: { InfoBarReplacedDetails* replaced_details = Details<InfoBarReplacedDetails>(details).ptr(); [controller_ closeInfoBarsForDelegate:replaced_details->first @@ -138,11 +139,11 @@ class InfoBarNotificationObserver : public NotificationObserver { Source<TabContentsWrapper> source(currentTabContents_); registrar_.Add(infoBarObserver_.get(), - NotificationType::TAB_CONTENTS_INFOBAR_ADDED, source); + chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, source); registrar_.Add(infoBarObserver_.get(), - NotificationType::TAB_CONTENTS_INFOBAR_REMOVED, source); + chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, source); registrar_.Add(infoBarObserver_.get(), - NotificationType::TAB_CONTENTS_INFOBAR_REPLACED, source); + chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REPLACED, source); } [self positionInfoBarsAndRedraw]; 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 46e9aa1..e922e1d 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 @@ -147,7 +147,7 @@ class LocationBarViewMac : public AutocompleteEditController, // Overridden from NotificationObserver. - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); 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 1721aef..23d887a 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 @@ -41,6 +41,7 @@ #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h" #include "chrome/browser/ui/content_settings/content_setting_image_model.h" #include "chrome/browser/ui/omnibox/location_bar_util.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" @@ -100,7 +101,7 @@ LocationBarViewMac::LocationBarViewMac( } registrar_.Add(this, - NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, + chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, NotificationService::AllSources()); edit_bookmarks_enabled_.Init(prefs::kEditBookmarksEnabled, @@ -181,7 +182,7 @@ void LocationBarViewMac::UpdatePageActions() { Layout(); if (page_action_decorations_.size() != count_before) { NotificationService::current()->Notify( - NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED, + chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED, Source<LocationBar>(this), NotificationService::NoDetails()); } @@ -193,7 +194,7 @@ void LocationBarViewMac::InvalidatePageActions() { Layout(); if (page_action_decorations_.size() != count_before) { NotificationService::current()->Notify( - NotificationType::EXTENSION_PAGE_ACTION_COUNT_CHANGED, + chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_COUNT_CHANGED, Source<LocationBar>(this), NotificationService::NoDetails()); } @@ -474,11 +475,11 @@ NSImage* LocationBarViewMac::GetKeywordImage(const string16& keyword) { return OmniboxViewMac::ImageForResource(IDR_OMNIBOX_SEARCH); } -void LocationBarViewMac::Observe(NotificationType type, +void LocationBarViewMac::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: { + switch (type) { + case chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED: { TabContents* contents = GetTabContents(); if (Details<TabContents>(contents) != details) return; @@ -488,7 +489,7 @@ void LocationBarViewMac::Observe(NotificationType type, break; } - case NotificationType::PREF_CHANGED: + case chrome::NOTIFICATION_PREF_CHANGED: star_decoration_->SetVisible(IsStarEnabled()); OnChanged(); break; 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 bc91bb7..39bb38c 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h @@ -59,7 +59,7 @@ class PageActionDecoration : public ImageDecoration, private: // Overridden from NotificationObserver: - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); 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 3c11dec..22a86e4 100644 --- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.mm @@ -13,6 +13,7 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" #import "chrome/browser/ui/cocoa/extensions/extension_popup_controller.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/extensions/extension_action.h" #include "chrome/common/extensions/extension_resource.h" #include "content/browser/tab_contents/tab_contents.h" @@ -58,7 +59,7 @@ PageActionDecoration::PageActionDecoration( ImageLoadingTracker::DONT_CACHE); } - registrar_.Add(this, NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE, + registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE, Source<Profile>(profile_)); // We set the owner last of all so that we can determine whether we are in @@ -185,7 +186,7 @@ void PageActionDecoration::UpdateVisibility(TabContents* contents, if (IsVisible() != visible) { SetVisible(visible); NotificationService::current()->Notify( - NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, + chrome::NOTIFICATION_EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED, Source<ExtensionAction>(page_action_), Details<TabContents>(contents)); } @@ -239,11 +240,11 @@ NSMenu* PageActionDecoration::GetMenu() { } void PageActionDecoration::Observe( - NotificationType type, + int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::EXTENSION_HOST_VIEW_SHOULD_CLOSE: { + switch (type) { + case chrome::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: { ExtensionPopupController* popup = [ExtensionPopupController popup]; if (popup && ![popup isClosing]) [popup close]; 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 caea8af..3b59fb9 100644 --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm @@ -9,11 +9,11 @@ #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/content_notification_types.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/common/notification_type.h" @interface TabContentsController(Private) // Forwards frame update to |delegate_| (ResizeNotificationView calls it). @@ -31,7 +31,7 @@ class TabContentsNotificationBridge : public NotificationObserver { explicit TabContentsNotificationBridge(TabContentsController* controller); // Overriden from NotificationObserver. - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); // Register for |contents|'s notifications, remove all prior registrations. @@ -47,10 +47,10 @@ TabContentsNotificationBridge::TabContentsNotificationBridge( } void TabContentsNotificationBridge::Observe( - NotificationType type, + int type, const NotificationSource& source, const NotificationDetails& details) { - if (type == NotificationType::RENDER_VIEW_HOST_CHANGED) { + if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) { RenderViewHostSwitchedDetails* switched_details = Details<RenderViewHostSwitchedDetails>(details).ptr(); [controller_ tabContentsRenderViewHostChanged:switched_details->old_host @@ -64,7 +64,7 @@ void TabContentsNotificationBridge::ChangeTabContents(TabContents* contents) { registrar_.RemoveAll(); if (contents) { registrar_.Add(this, - NotificationType::RENDER_VIEW_HOST_CHANGED, + content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, 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 f901e3b..83f2cc2 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.h +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.h @@ -30,7 +30,7 @@ class ThemeInstallBubbleView : public NotificationObserver { virtual ~ThemeInstallBubbleView(); // NotificationObserver - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details); diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm index 753f3c6..0048a27 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm @@ -7,6 +7,7 @@ #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" #include "base/memory/scoped_nsobject.h" +#include "chrome/common/chrome_notification_types.h" #include "content/common/notification_service.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" @@ -62,27 +63,27 @@ ThemeInstallBubbleView::ThemeInstallBubbleView(NSWindow* window) // Close when theme has been installed. registrar_.Add( this, - NotificationType::BROWSER_THEME_CHANGED, + chrome::NOTIFICATION_BROWSER_THEME_CHANGED, NotificationService::AllSources()); // Close when we are installing an extension, not a theme. registrar_.Add( this, - NotificationType::NO_THEME_DETECTED, + chrome::NOTIFICATION_NO_THEME_DETECTED, NotificationService::AllSources()); registrar_.Add( this, - NotificationType::EXTENSION_INSTALLED, + chrome::NOTIFICATION_EXTENSION_INSTALLED, NotificationService::AllSources()); registrar_.Add( this, - NotificationType::EXTENSION_INSTALL_ERROR, + chrome::NOTIFICATION_EXTENSION_INSTALL_ERROR, NotificationService::AllSources()); // Don't let the bubble overlap the confirm dialog. registrar_.Add( this, - NotificationType::EXTENSION_WILL_SHOW_CONFIRM_DIALOG, + chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG, NotificationService::AllSources()); // Add the view. @@ -112,7 +113,7 @@ void ThemeInstallBubbleView::Close() { } } -void ThemeInstallBubbleView::Observe(NotificationType type, +void ThemeInstallBubbleView::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { Close(); diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 8a68fe7..7044bcc 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -44,12 +44,12 @@ #include "chrome/browser/ui/toolbar/toolbar_model.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "chrome/browser/upgrade_detector.h" +#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/common/notification_service.h" -#include "content/common/notification_type.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" @@ -123,19 +123,19 @@ class NotificationBridge : public NotificationObserver { public: explicit NotificationBridge(ToolbarController* controller) : controller_(controller) { - registrar_.Add(this, NotificationType::UPGRADE_RECOMMENDED, + registrar_.Add(this, chrome::NOTIFICATION_UPGRADE_RECOMMENDED, NotificationService::AllSources()); } // Overridden from NotificationObserver: - virtual void Observe(NotificationType type, + virtual void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - switch (type.value) { - case NotificationType::PREF_CHANGED: + switch (type) { + case chrome::NOTIFICATION_PREF_CHANGED: [controller_ prefChanged:Details<std::string>(details).ptr()]; break; - case NotificationType::UPGRADE_RECOMMENDED: + case chrome::NOTIFICATION_UPGRADE_RECOMMENDED: [controller_ badgeWrenchMenuIfNeeded]; break; default: 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 7eeff81..c50e077 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -14,10 +14,10 @@ #import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h" #include "chrome/browser/ui/toolbar/wrench_menu_model.h" #include "content/browser/user_metrics.h" +#include "content/common/content_notification_types.h" #include "content/common/notification_observer.h" #include "content/common/notification_service.h" #include "content/common/notification_source.h" -#include "content/common/notification_type.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @@ -35,14 +35,14 @@ class ZoomLevelObserver : public NotificationObserver { public: explicit ZoomLevelObserver(WrenchMenuController* controller) : controller_(controller) { - registrar_.Add(this, NotificationType::ZOOM_LEVEL_CHANGED, + registrar_.Add(this, content::NOTIFICATION_ZOOM_LEVEL_CHANGED, NotificationService::AllSources()); } - void Observe(NotificationType type, + void Observe(int type, const NotificationSource& source, const NotificationDetails& details) { - DCHECK_EQ(type.value, NotificationType::ZOOM_LEVEL_CHANGED); + DCHECK_EQ(type, content::NOTIFICATION_ZOOM_LEVEL_CHANGED); WrenchMenuModel* wrenchMenuModel = [controller_ wrenchMenuModel]; wrenchMenuModel->UpdateZoomControls(); const string16 level = |