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

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

Issue 2103603002: mash: Remove StatusAreaWidget references from system tray classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments, rename SetSystemTrayHeight to SetTrayBubbleHeight Created 4 years, 5 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
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | no next file » | 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 <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 22 matching lines...) Expand all
33 #include "ui/message_center/message_center_tray.h" 33 #include "ui/message_center/message_center_tray.h"
34 #include "ui/message_center/message_center_types.h" 34 #include "ui/message_center/message_center_types.h"
35 #include "ui/message_center/notifier_settings.h" 35 #include "ui/message_center/notifier_settings.h"
36 36
37 #if defined(OS_CHROMEOS) 37 #if defined(OS_CHROMEOS)
38 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos .h" 38 #include "chrome/browser/notifications/login_state_notification_blocker_chromeos .h"
39 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" 39 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
40 #endif 40 #endif
41 41
42 #if defined(USE_ASH) 42 #if defined(USE_ASH)
43 #include "ash/common/system/web_notification/web_notification_tray.h"
43 #include "ash/shell.h" 44 #include "ash/shell.h"
44 #include "ash/system/web_notification/web_notification_tray.h"
45 #endif 45 #endif
46 46
47 47
48 MessageCenterNotificationManager::MessageCenterNotificationManager( 48 MessageCenterNotificationManager::MessageCenterNotificationManager(
49 message_center::MessageCenter* message_center, 49 message_center::MessageCenter* message_center,
50 std::unique_ptr<message_center::NotifierSettingsProvider> settings_provider) 50 std::unique_ptr<message_center::NotifierSettingsProvider> settings_provider)
51 : message_center_(message_center), 51 : message_center_(message_center),
52 settings_provider_(std::move(settings_provider)), 52 settings_provider_(std::move(settings_provider)),
53 system_observer_(this), 53 system_observer_(this),
54 stats_collector_(message_center), 54 stats_collector_(message_center),
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 it != registry->enabled_extensions().end(); 377 it != registry->enabled_extensions().end();
378 ++it) { 378 ++it) {
379 if ((*it->get()).permissions_data()->HasAPIPermission( 379 if ((*it->get()).permissions_data()->HasAPIPermission(
380 extensions::APIPermission::ID::kNotificationProvider)) { 380 extensions::APIPermission::ID::kNotificationProvider)) {
381 extension_id = (*it->get()).id(); 381 extension_id = (*it->get()).id();
382 return extension_id; 382 return extension_id;
383 } 383 }
384 } 384 }
385 return extension_id; 385 return extension_id;
386 } 386 }
OLDNEW
« no previous file with comments | « ash/system/web_notification/web_notification_tray_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698