chrome/browser/ui/views/app_list/win/app_list_controller_delegate_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/ui/views/app_list/win/app_list_controller_delegate_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

« no previous file with comments | « chrome/browser/ui/views/app_list/linux/app_list_service_linux.cc ('k') | chrome/browser/ui/views/app_list/win/app_list_service_win.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

diff --git a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

index 743c4d1657df11c6cf8c45d02804d716aac9c6ea..29c712f6e53686f18d1d0d9fc4362fd502f4a904 100644

--- a/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

+++ b/chrome/browser/ui/views/app_list/win/app_list_controller_delegate_win.cc

@@ -30,15 +30,15 @@ gfx::ImageSkia AppListControllerDelegateWin::GetWindowIcon() {

}

void AppListControllerDelegateWin::FillLaunchParams(AppLaunchParams* params) {

- params->desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE;

+ params->desktop_type = ui::HOST_DESKTOP_TYPE_NATIVE;

extensions::AppWindow* any_existing_window =

extensions::AppWindowRegistry::Get(params->profile)

->GetCurrentAppWindowForApp(params->extension_id);

if (any_existing_window &&

chrome::GetHostDesktopTypeForNativeWindow(

- any_existing_window->GetNativeWindow())

- != chrome::HOST_DESKTOP_TYPE_NATIVE) {

- params->desktop_type = chrome::HOST_DESKTOP_TYPE_ASH;

+ any_existing_window->GetNativeWindow()) !=

+ ui::HOST_DESKTOP_TYPE_NATIVE) {

+ params->desktop_type = ui::HOST_DESKTOP_TYPE_ASH;

chrome::ActivateMetroChrome();

}