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

Index: chrome/browser/ui/views/frame/taskbar_decorator_win.cc

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

index 8772dce1f62d7c5f483db74da348841290021ff4..3facf4e950f0bee8cc4f6a08d5828e41e6b520c0 100644

--- a/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

+++ b/chrome/browser/ui/views/frame/taskbar_decorator_win.cc

@@ -69,10 +69,10 @@ void SetOverlayIcon(HWND hwnd, scoped_ptr<SkBitmap> bitmap) {

} // namespace

void DrawTaskbarDecoration(gfx::NativeWindow window, const gfx::Image* image) {

- // HOST_DESKTOP_TYPE_ASH doesn't use the taskbar.

+ // ui::HOST_DESKTOP_TYPE_ASH doesn't use the taskbar.

if (base::win::GetVersion() < base::win::VERSION_WIN7 ||

chrome::GetHostDesktopTypeForNativeWindow(window) !=

- chrome::HOST_DESKTOP_TYPE_NATIVE)

+ ui::HOST_DESKTOP_TYPE_NATIVE)

return;

HWND hwnd = views::HWNDForNativeWindow(window);