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

Side by Side 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, 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 | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
(...skipping 11 matching lines...) Expand all
22 #include "ui/message_center/message_center_constants.h" 22 #include "ui/message_center/message_center_constants.h"
23 #include "ui/message_center/message_center_tray.h" 23 #include "ui/message_center/message_center_tray.h"
24 24
25 MessageCenterNotificationManager::MessageCenterNotificationManager( 25 MessageCenterNotificationManager::MessageCenterNotificationManager(
26 message_center::MessageCenter* message_center) 26 message_center::MessageCenter* message_center)
27 : message_center_(message_center), 27 : message_center_(message_center),
28 settings_controller_(new MessageCenterSettingsController) { 28 settings_controller_(new MessageCenterSettingsController) {
29 message_center_->SetDelegate(this); 29 message_center_->SetDelegate(this);
30 message_center_->AddObserver(this); 30 message_center_->AddObserver(this);
31 31
32 #if !defined(OS_CHROMEOS) 32 #if defined(OS_WIN) || defined(OS_MACOSX)
33 // On Windows, the notification manager owns the tray icon and views. Other 33 // On Windows and Mac, the notification manager owns the tray icon and views.
34 // platforms have global ownership and Create will return NULL. 34 // Other platforms have global ownership and Create will return NULL.
35 tray_.reset(message_center::CreateMessageCenterTray()); 35 tray_.reset(message_center::CreateMessageCenterTray());
36 #endif 36 #endif
37 } 37 }
38 38
39 MessageCenterNotificationManager::~MessageCenterNotificationManager() { 39 MessageCenterNotificationManager::~MessageCenterNotificationManager() {
40 message_center_->RemoveObserver(this); 40 message_center_->RemoveObserver(this);
41 } 41 }
42 42
43 43
44 //////////////////////////////////////////////////////////////////////////////// 44 ////////////////////////////////////////////////////////////////////////////////
(...skipping 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
458 458
459 MessageCenterNotificationManager::ProfileNotification* 459 MessageCenterNotificationManager::ProfileNotification*
460 MessageCenterNotificationManager::FindProfileNotification( 460 MessageCenterNotificationManager::FindProfileNotification(
461 const std::string& id) const { 461 const std::string& id) const {
462 NotificationMap::const_iterator iter = profile_notifications_.find(id); 462 NotificationMap::const_iterator iter = profile_notifications_.find(id);
463 if (iter == profile_notifications_.end()) 463 if (iter == profile_notifications_.end())
464 return NULL; 464 return NULL;
465 465
466 return (*iter).second; 466 return (*iter).second;
467 } 467 }
OLDNEW
« 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