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

Index: chrome/browser/ui/views/tabs/tab.cc

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

index a22268969972ed432dc0ac892fda3c6c16c572e5..8536f1e5e89c02ea58050f1349ec3e5388aa2c9b 100644

--- a/chrome/browser/ui/views/tabs/tab.cc

+++ b/chrome/browser/ui/views/tabs/tab.cc

@@ -178,7 +178,7 @@ void DrawIconCenter(gfx::Canvas* canvas,

icon_height, filter, paint);

}

-chrome::HostDesktopType GetHostDesktopType(views::View* view) {

+ui::HostDesktopType GetHostDesktopType(views::View* view) {

// Widget is NULL when tabs are detached.

views::Widget* widget = view->GetWidget();

return chrome::GetHostDesktopTypeForNativeView(

@@ -1186,7 +1186,7 @@ void Tab::PaintInactiveTabBackground(gfx::Canvas* canvas) {

GetTabIdAndFrameId(widget, &tab_id, &frame_id);

// Explicitly map the id so we cache correctly.

- const chrome::HostDesktopType host_desktop_type = GetHostDesktopType(this);

+ const ui::HostDesktopType host_desktop_type = GetHostDesktopType(this);

tab_id = chrome::MapThemeImage(host_desktop_type, tab_id);

// HasCustomImage() is only true if the theme provides the image. However,