OLD | NEW |
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/browser_process.h" |
14 #include "chrome/browser/chrome_notification_types.h" | 15 #include "chrome/browser/chrome_notification_types.h" |
15 #include "chrome/browser/lifetime/application_lifetime.h" | 16 #include "chrome/browser/lifetime/application_lifetime.h" |
16 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
17 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h" | 18 #include "chrome/browser/ui/ash/system_tray_delegate_utils.h" |
18 #include "chrome/browser/ui/chrome_pages.h" | 19 #include "chrome/browser/ui/chrome_pages.h" |
19 #include "chrome/browser/ui/host_desktop.h" | 20 #include "chrome/browser/ui/host_desktop.h" |
20 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 21 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
21 #include "chrome/browser/upgrade_detector.h" | 22 #include "chrome/browser/upgrade_detector.h" |
22 #include "chrome/grit/locale_settings.h" | 23 #include "chrome/grit/locale_settings.h" |
23 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 81 |
81 void SystemTrayDelegateCommon::ShowChromeSlow() { | 82 void SystemTrayDelegateCommon::ShowChromeSlow() { |
82 #if defined(OS_LINUX) | 83 #if defined(OS_LINUX) |
83 chrome::ScopedTabbedBrowserDisplayer displayer( | 84 chrome::ScopedTabbedBrowserDisplayer displayer( |
84 ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH); | 85 ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH); |
85 chrome::ShowSlow(displayer.browser()); | 86 chrome::ShowSlow(displayer.browser()); |
86 #endif // defined(OS_LINUX) | 87 #endif // defined(OS_LINUX) |
87 } | 88 } |
88 | 89 |
89 void SystemTrayDelegateCommon::ShowHelp() { | 90 void SystemTrayDelegateCommon::ShowHelp() { |
90 chrome::ShowHelpForProfile(ProfileManager::GetLastUsedProfile(), | 91 chrome::ShowHelpForProfile( |
91 chrome::HOST_DESKTOP_TYPE_ASH, | 92 g_browser_process->profile_manager()->GetLastUsedProfile(), |
92 chrome::HELP_SOURCE_MENU); | 93 chrome::HOST_DESKTOP_TYPE_ASH, chrome::HELP_SOURCE_MENU); |
93 } | 94 } |
94 | 95 |
95 void SystemTrayDelegateCommon::RequestRestartForUpdate() { | 96 void SystemTrayDelegateCommon::RequestRestartForUpdate() { |
96 chrome::AttemptRestart(); | 97 chrome::AttemptRestart(); |
97 } | 98 } |
98 | 99 |
99 int SystemTrayDelegateCommon::GetSystemTrayMenuWidth() { | 100 int SystemTrayDelegateCommon::GetSystemTrayMenuWidth() { |
100 return l10n_util::GetLocalizedContentsWidthInPixels( | 101 return l10n_util::GetLocalizedContentsWidthInPixels( |
101 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS); | 102 IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS); |
102 } | 103 } |
(...skipping 10 matching lines...) Expand all Loading... |
113 const content::NotificationSource& source, | 114 const content::NotificationSource& source, |
114 const content::NotificationDetails& details) { | 115 const content::NotificationDetails& details) { |
115 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { | 116 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { |
116 ash::UpdateInfo info; | 117 ash::UpdateInfo info; |
117 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); | 118 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); |
118 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); | 119 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); |
119 } else { | 120 } else { |
120 NOTREACHED(); | 121 NOTREACHED(); |
121 } | 122 } |
122 } | 123 } |
OLD | NEW |