chrome/browser/ui/views/theme_image_mapper.cc - Issue 1391893003: NOT FOR REVIEW: Aura on Android

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/theme_image_mapper.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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:

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

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

index 69284a23d5f1b94e03f1f84426e63a4ea6141ca1..bb5f4fa0647bf42bf11e76543f0ed1e410c03c71 100644

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

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

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

// On platforms where there is both Ash and a desktop browser, provide DESKTOP

// resources for the latter.

int MapThemeImage(HostDesktopType desktop_type, int resource) {

-#if !defined(OS_CHROMEOS) && !defined(OS_MACOSX)

+#if !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && !defined(OS_ANDROID)

if (desktop_type != HOST_DESKTOP_TYPE_NATIVE)

return resource;