Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3944)

Unified Diff: chrome/browser/ui/views/theme_image_mapper.cc

Issue 1419583006: Use default theme resource for aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove comment 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..ba33555da703a9156073fa85543eb21d624afec4 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;
@@ -37,7 +37,7 @@ int MapThemeImage(HostDesktopType desktop_type, int resource) {
default:
break;
}
-#endif // !defined(OS_CHROMEOS)
+#endif
return resource;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698