chrome/browser/ui/views/color_chooser_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/color_chooser_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/chrome_views_delegate.cc ('k') | chrome/browser/ui/views/extensions/bookmark_app_bubble_view.cc » ('j') | ui/gfx/host_desktop_type.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/color_chooser_win.cc

diff --git a/chrome/browser/ui/views/color_chooser_win.cc b/chrome/browser/ui/views/color_chooser_win.cc

index 8d44da4c2ad419f15f15b45c664f154c88c0537d..10637cee4725b98855585f475afebaab62d7aac2 100644

--- a/chrome/browser/ui/views/color_chooser_win.cc

+++ b/chrome/browser/ui/views/color_chooser_win.cc

@@ -100,7 +100,7 @@ namespace chrome {

content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,

SkColor initial_color) {

gfx::NativeView native_view = web_contents->GetNativeView();

- if (GetHostDesktopTypeForNativeView(native_view) == HOST_DESKTOP_TYPE_ASH)

+ if (GetHostDesktopTypeForNativeView(native_view) == ui::HOST_DESKTOP_TYPE_ASH)

return ColorChooserAura::Open(web_contents, initial_color);

return ColorChooserWin::Open(web_contents, initial_color);