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

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

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT Created 6 years, 7 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
Index: chrome/browser/ui/views/theme_image_mapper_desktop.cc
diff --git a/chrome/browser/ui/views/theme_image_mapper_aura_win.cc b/chrome/browser/ui/views/theme_image_mapper_desktop.cc
similarity index 66%
rename from chrome/browser/ui/views/theme_image_mapper_aura_win.cc
rename to chrome/browser/ui/views/theme_image_mapper_desktop.cc
index 8ef3bb01a0f8945e8d853449b1334ec1e7342a95..62dda54fabcf5ba1d9e46bc7569c54b8d95f3139 100644
--- a/chrome/browser/ui/views/theme_image_mapper_aura_win.cc
+++ b/chrome/browser/ui/views/theme_image_mapper_desktop.cc
@@ -14,23 +14,23 @@ int MapThemeImage(HostDesktopType desktop_type, int resource) {
switch (resource) {
case IDR_CONTENT_TOP_CENTER:
- return IDR_CONTENT_TOP_CENTER_WIN;
+ return IDR_CONTENT_TOP_CENTER_DESKTOP;
case IDR_OTR_ICON:
- return IDR_OTR_ICON_WIN;
+ return IDR_OTR_ICON_DESKTOP;
case IDR_THEME_FRAME:
- return IDR_THEME_FRAME_WIN;
+ return IDR_THEME_FRAME_DESKTOP;
case IDR_THEME_FRAME_INACTIVE:
- return IDR_THEME_FRAME_INACTIVE_WIN;
+ return IDR_THEME_FRAME_INACTIVE_DESKTOP;
case IDR_THEME_FRAME_INCOGNITO:
- return IDR_THEME_FRAME_INCOGNITO_WIN;
+ return IDR_THEME_FRAME_INCOGNITO_DESKTOP;
case IDR_THEME_FRAME_INCOGNITO_INACTIVE:
- return IDR_THEME_FRAME_INCOGNITO_INACTIVE_WIN;
+ return IDR_THEME_FRAME_INCOGNITO_INACTIVE_DESKTOP;
case IDR_THEME_TAB_BACKGROUND:
- return IDR_THEME_TAB_BACKGROUND_WIN;
+ return IDR_THEME_TAB_BACKGROUND_DESKTOP;
case IDR_THEME_TAB_BACKGROUND_INCOGNITO:
- return IDR_THEME_TAB_BACKGROUND_INCOGNITO_WIN;
+ return IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP;
case IDR_THEME_TOOLBAR:
- return IDR_THEME_TOOLBAR_WIN;
+ return IDR_THEME_TOOLBAR_DESKTOP;
default:
break;
}
« no previous file with comments | « chrome/browser/ui/views/theme_image_mapper_chromeos.cc ('k') | chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698