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" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 GetUpdateInfo(UpgradeDetector::GetInstance(), info); | 75 GetUpdateInfo(UpgradeDetector::GetInstance(), info); |
76 } | 76 } |
77 | 77 |
78 base::HourClockType SystemTrayDelegateCommon::GetHourClockType() const { | 78 base::HourClockType SystemTrayDelegateCommon::GetHourClockType() const { |
79 return clock_type_; | 79 return clock_type_; |
80 } | 80 } |
81 | 81 |
82 void SystemTrayDelegateCommon::ShowChromeSlow() { | 82 void SystemTrayDelegateCommon::ShowChromeSlow() { |
83 #if defined(OS_LINUX) | 83 #if defined(OS_LINUX) |
84 chrome::ScopedTabbedBrowserDisplayer displayer( | 84 chrome::ScopedTabbedBrowserDisplayer displayer( |
85 ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH); | 85 ProfileManager::GetPrimaryUserProfile()); |
86 chrome::ShowSlow(displayer.browser()); | 86 chrome::ShowSlow(displayer.browser()); |
87 #endif // defined(OS_LINUX) | 87 #endif // defined(OS_LINUX) |
88 } | 88 } |
89 | 89 |
90 void SystemTrayDelegateCommon::ShowHelp() { | 90 void SystemTrayDelegateCommon::ShowHelp() { |
91 chrome::ShowHelpForProfile(ProfileManager::GetLastUsedProfile(), | 91 chrome::ShowHelpForProfile(ProfileManager::GetLastUsedProfile(), |
92 chrome::HOST_DESKTOP_TYPE_ASH, | 92 chrome::HOST_DESKTOP_TYPE_ASH, |
93 chrome::HELP_SOURCE_MENU); | 93 chrome::HELP_SOURCE_MENU); |
94 } | 94 } |
95 | 95 |
(...skipping 18 matching lines...) Expand all Loading... |
114 const content::NotificationSource& source, | 114 const content::NotificationSource& source, |
115 const content::NotificationDetails& details) { | 115 const content::NotificationDetails& details) { |
116 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { | 116 if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) { |
117 ash::UpdateInfo info; | 117 ash::UpdateInfo info; |
118 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); | 118 GetUpdateInfo(content::Source<UpgradeDetector>(source).ptr(), &info); |
119 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); | 119 GetSystemTrayNotifier()->NotifyUpdateRecommended(info); |
120 } else { | 120 } else { |
121 NOTREACHED(); | 121 NOTREACHED(); |
122 } | 122 } |
123 } | 123 } |
OLD | NEW |