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

Side by Side Diff: chrome/browser/notifications/message_center_notification_manager.cc

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT Created 6 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/notifications/message_center_notification_manager.h" 5 #include "chrome/browser/notifications/message_center_notification_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 71
72 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
73 blockers_.push_back( 73 blockers_.push_back(
74 new LoginStateNotificationBlockerChromeOS(message_center)); 74 new LoginStateNotificationBlockerChromeOS(message_center));
75 #else 75 #else
76 blockers_.push_back(new ScreenLockNotificationBlocker(message_center)); 76 blockers_.push_back(new ScreenLockNotificationBlocker(message_center));
77 #endif 77 #endif
78 blockers_.push_back(new FullscreenNotificationBlocker(message_center)); 78 blockers_.push_back(new FullscreenNotificationBlocker(message_center));
79 79
80 #if defined(OS_WIN) || defined(OS_MACOSX) \ 80 #if defined(OS_WIN) || defined(OS_MACOSX) \
81 || (defined(USE_AURA) && !defined(USE_ASH)) 81 || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
82 // On Windows, Linux and Mac, the notification manager owns the tray icon and 82 // On Windows, Linux and Mac, the notification manager owns the tray icon and
83 // views.Other platforms have global ownership and Create will return NULL. 83 // views.Other platforms have global ownership and Create will return NULL.
84 tray_.reset(message_center::CreateMessageCenterTray()); 84 tray_.reset(message_center::CreateMessageCenterTray());
85 #endif 85 #endif
86 registrar_.Add(this, 86 registrar_.Add(this,
87 chrome::NOTIFICATION_FULLSCREEN_CHANGED, 87 chrome::NOTIFICATION_FULLSCREEN_CHANGED,
88 content::NotificationService::AllSources()); 88 content::NotificationService::AllSources());
89 } 89 }
90 90
91 MessageCenterNotificationManager::~MessageCenterNotificationManager() { 91 MessageCenterNotificationManager::~MessageCenterNotificationManager() {
(...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 493
494 MessageCenterNotificationManager::ProfileNotification* 494 MessageCenterNotificationManager::ProfileNotification*
495 MessageCenterNotificationManager::FindProfileNotification( 495 MessageCenterNotificationManager::FindProfileNotification(
496 const std::string& id) const { 496 const std::string& id) const {
497 NotificationMap::const_iterator iter = profile_notifications_.find(id); 497 NotificationMap::const_iterator iter = profile_notifications_.find(id);
498 if (iter == profile_notifications_.end()) 498 if (iter == profile_notifications_.end())
499 return NULL; 499 return NULL;
500 500
501 return (*iter).second; 501 return (*iter).second;
502 } 502 }
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/managed_user_theme.cc ('k') | chrome/browser/signin/signin_error_notifier_ash_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698