chrome/browser/ui/ash/system_tray_delegate_common.cc - Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_common.cc

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl

Patch Set: Fix build on Mac and CrOS 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/system_tray_delegate_chromeos.cc ('k') | chrome/browser/ui/ash/window_positioner_unittest.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/system_tray_delegate_common.cc

diff --git a/chrome/browser/ui/ash/system_tray_delegate_common.cc b/chrome/browser/ui/ash/system_tray_delegate_common.cc

index fa6b9e630a36fe1a32def17c1d953d0a8c069f32..7918cbf8754fda572e080c20a03f290ecf694b4e 100644

--- a/chrome/browser/ui/ash/system_tray_delegate_common.cc

+++ b/chrome/browser/ui/ash/system_tray_delegate_common.cc

@@ -81,14 +81,14 @@ base::HourClockType SystemTrayDelegateCommon::GetHourClockType() const {

void SystemTrayDelegateCommon::ShowChromeSlow() {

#if defined(OS_LINUX)

chrome::ScopedTabbedBrowserDisplayer displayer(

- ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);

+ ProfileManager::GetPrimaryUserProfile(), ui::HOST_DESKTOP_TYPE_ASH);

chrome::ShowSlow(displayer.browser());

#endif // defined(OS_LINUX)

}

void SystemTrayDelegateCommon::ShowHelp() {

chrome::ShowHelpForProfile(ProfileManager::GetLastUsedProfile(),

- chrome::HOST_DESKTOP_TYPE_ASH,

+ ui::HOST_DESKTOP_TYPE_ASH,

chrome::HELP_SOURCE_MENU);

}