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

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

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

index ac7d9c2bad702f65debcafb896b7940447bf9457..814dc2ef35636e5fc42f24d9eff8b3980de06ef4 100644

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

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

@@ -47,7 +47,7 @@ class DesktopThemeProvider : public ui::ThemeProvider {

}

gfx::ImageSkia* GetImageSkiaNamed(int id) const override {

return delegate_->GetImageSkiaNamed(

- chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));

+ chrome::MapThemeImage(ui::HOST_DESKTOP_TYPE_NATIVE, id));

}

SkColor GetColor(int id) const override {

return delegate_->GetColor(id);

@@ -60,7 +60,7 @@ class DesktopThemeProvider : public ui::ThemeProvider {

}

bool HasCustomImage(int id) const override {

return delegate_->HasCustomImage(

- chrome::MapThemeImage(chrome::HOST_DESKTOP_TYPE_NATIVE, id));

+ chrome::MapThemeImage(ui::HOST_DESKTOP_TYPE_NATIVE, id));

}

base::RefCountedMemory* GetRawData(

int id,