diff options
author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 17:53:32 +0000 |
---|---|---|
committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-10 17:53:32 +0000 |
commit | 14fb7d3274f0d1c0617dbbfe6dbb43800a031d4f (patch) | |
tree | 13dc3b2e1c66967c23bcf28d11a6f04df114e5b5 | |
parent | 95ca629d155ff8cca8c7ed5528487629bd3410ac (diff) | |
download | chromium_src-14fb7d3274f0d1c0617dbbfe6dbb43800a031d4f.zip chromium_src-14fb7d3274f0d1c0617dbbfe6dbb43800a031d4f.tar.gz chromium_src-14fb7d3274f0d1c0617dbbfe6dbb43800a031d4f.tar.bz2 |
Fix for build failures on mac and Linux
BUG=none
TEST=it compiles
TBR=joi
Review URL: http://codereview.chromium.org/7327032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91978 0039d316-1c4b-4281-b951-d872f2087c98
5 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index db0a2d1..f1d108c 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -44,6 +44,7 @@ #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" #include "chrome/browser/ui/cocoa/task_manager_mac.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/common/app_mode_common_mac.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" @@ -550,7 +551,7 @@ void RecordLastRunAppBundlePath() { // This is called after profiles have been loaded and preferences registered. // It is safe to access the default profile here. - (void)applicationDidBecomeActive:(NSNotification*)notify { - NotificationService::current()->Notify(chrome::NOTIFICATION_APP_ACTIVATED, + NotificationService::current()->Notify(content::NOTIFICATION_APP_ACTIVATED, NotificationService::AllSources(), NotificationService::NoDetails()); } diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index d7f47d1..70f0a64 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -748,7 +748,7 @@ TabContentsWrapper* InstantLoader::ReleasePreviewContents( SetTakesFocusOnlyOnMouseDown(false); registrar_.Remove( this, - chrome::RENDER_VIEW_HOST_CHANGED, + content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED, Source<NavigationController>(&preview_contents_->controller())); #endif } @@ -858,7 +858,7 @@ void InstantLoader::Observe(int type, const NotificationSource& source, const NotificationDetails& details) { #if defined(OS_MACOSX) - if (type == chrome::RENDER_VIEW_HOST_CHANGED) { + if (type == content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED) { if (preview_contents_->tab_contents()->GetRenderWidgetHostView()) { preview_contents_->tab_contents()->GetRenderWidgetHostView()-> SetTakesFocusOnlyOnMouseDown(true); diff --git a/chrome/browser/tab_contents/popup_menu_helper_mac.mm b/chrome/browser/tab_contents/popup_menu_helper_mac.mm index 328e9c5..d38d10b 100644 --- a/chrome/browser/tab_contents/popup_menu_helper_mac.mm +++ b/chrome/browser/tab_contents/popup_menu_helper_mac.mm @@ -18,7 +18,7 @@ PopupMenuHelper::PopupMenuHelper(RenderViewHost* render_view_host) : render_view_host_(render_view_host) { notification_registrar_.Add( - this, content::RENDER_WIDGET_HOST_DESTROYED, + this, content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, Source<RenderWidgetHost>(render_view_host)); } @@ -79,7 +79,7 @@ void PopupMenuHelper::Observe( int type, const NotificationSource& source, const NotificationDetails& details) { - DCHECK(type == content::RENDER_WIDGET_HOST_DESTROYED); + DCHECK(type == content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED); RenderViewHost* rvh = Source<RenderViewHost>(source).ptr(); DCHECK_EQ(render_view_host_, rvh); render_view_host_ = NULL; diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm index 17899e5..9d44e3b 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm @@ -132,10 +132,10 @@ class DevtoolsNotificationBridge : public NotificationObserver { notificationBridge_.reset(new DevtoolsNotificationBridge(self)); registrar_.reset(new NotificationRegistrar); registrar_->Add(notificationBridge_.get(), - chrome::DEVTOOLS_WINDOW_CLOSING, + content::NOTIFICATION_DEVTOOLS_WINDOW_CLOSING, Source<Profile>(host->profile())); registrar_->Add(notificationBridge_.get(), - chrome::EXTENSION_HOST_DID_STOP_LOADING, + chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, Source<Profile>(host->profile())); } return self; diff --git a/content/browser/renderer_host/resource_dispatcher_host.cc b/content/browser/renderer_host/resource_dispatcher_host.cc index cefab8b..314be90 100644 --- a/content/browser/renderer_host/resource_dispatcher_host.cc +++ b/content/browser/renderer_host/resource_dispatcher_host.cc @@ -1655,7 +1655,7 @@ void ResourceDispatcherHost::NotifyResponseStarted(net::URLRequest* request, BrowserThread::UI, FROM_HERE, NewRunnableFunction( &ResourceDispatcherHost::NotifyOnUI<ResourceRequestDetails>, - content::NOTIFICATION_RESOURCE_RESPONSE_STARTED, + static_cast<int>(content::NOTIFICATION_RESOURCE_RESPONSE_STARTED), render_process_id, render_view_id, detail)); } @@ -1673,7 +1673,7 @@ void ResourceDispatcherHost::NotifyReceivedRedirect(net::URLRequest* request, BrowserThread::UI, FROM_HERE, NewRunnableFunction( &ResourceDispatcherHost::NotifyOnUI<ResourceRedirectDetails>, - content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT, + static_cast<int>(content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT), render_process_id, render_view_id, detail)); } |