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

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

Issue 1707773002: Revert of Remove HostDesktopType from AppLaunchParams (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-15
Patch Set: rebase Created 4 years, 10 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"
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
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()); 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::HELP_SOURCE_MENU); 93 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);
(...skipping 11 matching lines...) Expand all
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 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/chrome_pages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698