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

Unified Diff: chrome/browser/managed_mode/managed_user_theme.cc

Issue 25108005: linux_aura: Compile ash into chrome. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix win64 compile. Created 6 years, 8 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/managed_mode/managed_user_theme.cc
diff --git a/chrome/browser/managed_mode/managed_user_theme.cc b/chrome/browser/managed_mode/managed_user_theme.cc
index f2055a208bc2340f84997bdb55768e62aa34fdbd..67f4adf10e5bd2a54a3e91b24a90b99066d2b4eb 100644
--- a/chrome/browser/managed_mode/managed_user_theme.cc
+++ b/chrome/browser/managed_mode/managed_user_theme.cc
@@ -21,19 +21,19 @@ const SkColor kDefaultColorManagedUserLabelBackground =
int MapToManagedUserResourceIds(int id) {
switch (id) {
case IDR_THEME_FRAME:
-#if defined(OS_WIN)
- case IDR_THEME_FRAME_WIN:
+#if defined(USE_ASH) && !defined(OS_CHROMEOS)
+ case IDR_THEME_FRAME_DESKTOP:
#endif
return IDR_MANAGED_USER_THEME_FRAME;
case IDR_THEME_FRAME_INACTIVE:
-#if defined(OS_WIN)
- case IDR_THEME_FRAME_INACTIVE_WIN:
+#if defined(USE_ASH) && !defined(OS_CHROMEOS)
+ case IDR_THEME_FRAME_INACTIVE_DESKTOP
#endif
return IDR_MANAGED_USER_THEME_FRAME_INACTIVE;
case IDR_THEME_TAB_BACKGROUND:
case IDR_THEME_TAB_BACKGROUND_V:
-#if defined(OS_WIN)
- case IDR_THEME_TAB_BACKGROUND_WIN:
+#if defined(USE_ASH) && !defined(OS_CHROMEOS)
+ case IDR_THEME_TAB_BACKGROUND_DESKTOP:
#endif
return IDR_MANAGED_USER_THEME_TAB_BACKGROUND;
}

Powered by Google App Engine
This is Rietveld 408576698