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

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

Issue 276773004: Revert 269892 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/chrome/browser/managed_mode/managed_user_theme.cc
===================================================================
--- trunk/src/chrome/browser/managed_mode/managed_user_theme.cc (revision 269901)
+++ trunk/src/chrome/browser/managed_mode/managed_user_theme.cc (working copy)
@@ -21,19 +21,19 @@
int MapToManagedUserResourceIds(int id) {
switch (id) {
case IDR_THEME_FRAME:
-#if defined(USE_ASH) && !defined(OS_CHROMEOS)
- case IDR_THEME_FRAME_DESKTOP:
+#if defined(OS_WIN)
+ case IDR_THEME_FRAME_WIN:
#endif
return IDR_MANAGED_USER_THEME_FRAME;
case IDR_THEME_FRAME_INACTIVE:
-#if defined(USE_ASH) && !defined(OS_CHROMEOS)
- case IDR_THEME_FRAME_INACTIVE_DESKTOP:
+#if defined(OS_WIN)
+ case IDR_THEME_FRAME_INACTIVE_WIN:
#endif
return IDR_MANAGED_USER_THEME_FRAME_INACTIVE;
case IDR_THEME_TAB_BACKGROUND:
case IDR_THEME_TAB_BACKGROUND_V:
-#if defined(USE_ASH) && !defined(OS_CHROMEOS)
- case IDR_THEME_TAB_BACKGROUND_DESKTOP:
+#if defined(OS_WIN)
+ case IDR_THEME_TAB_BACKGROUND_WIN:
#endif
return IDR_MANAGED_USER_THEME_TAB_BACKGROUND;
}

Powered by Google App Engine
This is Rietveld 408576698