chrome/browser/platform_util_win.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/platform_util_win.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

Index: chrome/browser/platform_util_win.cc

diff --git a/chrome/browser/platform_util_win.cc b/chrome/browser/platform_util_win.cc

index 4e2d9f26fc5f06f7f8339fc2925cf2a856943898..faea2a654bb88a9c43893634b141c38e476a1b06 100644

--- a/chrome/browser/platform_util_win.cc

+++ b/chrome/browser/platform_util_win.cc

@@ -188,7 +188,7 @@ void OpenItemViaShellInUtilityProcess(const base::FilePath& full_path,

void ActivateDesktopIfNecessary() {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)

+ if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH)

chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);

}

@@ -229,7 +229,7 @@ void PlatformOpenVerifiedItem(const base::FilePath& path, OpenItemType type) {

void OpenExternal(Profile* profile, const GURL& url) {

DCHECK_CURRENTLY_ON(BrowserThread::UI);

- if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH &&

+ if (chrome::GetActiveDesktop() == ui::HOST_DESKTOP_TYPE_ASH &&

!url.SchemeIsHTTPOrHTTPS())

chrome::ActivateDesktopHelper(chrome::ASH_KEEP_RUNNING);

« no previous file with comments | « chrome/browser/platform_util_chromeos.cc ('k') | chrome/browser/plugins/plugin_observer.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')