Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: chrome/browser/notifications/message_center_notification_manager.cc

Issue 14554002: Get use_aura=1 and use_aura=1 use_ash=1 building on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/ui/app_list/app_list_service_selector.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/notifications/message_center_notification_manager.cc
diff --git a/chrome/browser/notifications/message_center_notification_manager.cc b/chrome/browser/notifications/message_center_notification_manager.cc
index 1905b829908e0a65d5853a9f37141bd043d80ef1..01ffa5a8429b6ea9db78e39e01d4155e4e49a9d5 100644
--- a/chrome/browser/notifications/message_center_notification_manager.cc
+++ b/chrome/browser/notifications/message_center_notification_manager.cc
@@ -29,9 +29,9 @@ MessageCenterNotificationManager::MessageCenterNotificationManager(
message_center_->SetDelegate(this);
message_center_->AddObserver(this);
-#if !defined(OS_CHROMEOS)
- // On Windows, the notification manager owns the tray icon and views. Other
- // platforms have global ownership and Create will return NULL.
+#if defined(OS_WIN) || defined(OS_MACOSX)
+ // On Windows and Mac, the notification manager owns the tray icon and views.
+ // Other platforms have global ownership and Create will return NULL.
tray_.reset(message_center::CreateMessageCenterTray());
#endif
}
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/ui/app_list/app_list_service_selector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698