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

Side by Side Diff: chrome/browser/ui/ash/system_tray_delegate_common.cc

Issue 1336993002: Straighten up includes of host_desktop.h/host_desktop_type.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@host_desktop_type
Patch Set: Build fixes for Windows and Mac Created 5 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/ash/system_tray_delegate_common.h" 5 #include "chrome/browser/ui/ash/system_tray_delegate_common.h"
6 6
7 #include "ash/networking_config_delegate.h" 7 #include "ash/networking_config_delegate.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_delegate.h" 9 #include "ash/shell_delegate.h"
10 #include "ash/system/tray/system_tray.h" 10 #include "ash/system/tray/system_tray.h"
11 #include "ash/system/tray/system_tray_notifier.h" 11 #include "ash/system/tray/system_tray_notifier.h"
12 #include "ash/volume_control_delegate.h" 12 #include "ash/volume_control_delegate.h"
13 #include "base/time/time.h" 13 #include "base/time/time.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/lifetime/application_lifetime.h" 15 #include "chrome/browser/lifetime/application_lifetime.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h" 17 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h"
18 #include "chrome/browser/ui/chrome_pages.h" 18 #include "chrome/browser/ui/chrome_pages.h"
19 #include "chrome/browser/ui/host_desktop.h"
20 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" 19 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
21 #include "chrome/browser/upgrade_detector.h" 20 #include "chrome/browser/upgrade_detector.h"
22 #include "chrome/grit/locale_settings.h" 21 #include "chrome/grit/locale_settings.h"
23 #include "content/public/browser/notification_service.h" 22 #include "content/public/browser/notification_service.h"
24 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/gfx/host_desktop_type.h"
25 25
26 namespace { 26 namespace {
27 27
28 ash::SystemTrayNotifier* GetSystemTrayNotifier() { 28 ash::SystemTrayNotifier* GetSystemTrayNotifier() {
29 return ash::Shell::GetInstance()->system_tray_notifier(); 29 return ash::Shell::GetInstance()->system_tray_notifier();
30 } 30 }
31 31
32 } // namespace 32 } // namespace
33 33
34 SystemTrayDelegateCommon::SystemTrayDelegateCommon() 34 SystemTrayDelegateCommon::SystemTrayDelegateCommon()
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 const content::NotificationSource& source, 113 const content::NotificationSource& source,
114 const content::NotificationDetails& details) { 114 const content::NotificationDetails& details) {
115 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { 115 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
116 ash::UpdateInfo info; 116 ash::UpdateInfo info;
117 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); 117 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info);
118 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); 118 GetSystemTrayNotifier()->NotifyUpdateRecommended(info);
119 } else { 119 } else {
120 NOTREACHED(); 120 NOTREACHED();
121 } 121 }
122 } 122 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698