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

Unified Diff: chrome/browser/managed_mode/managed_user_theme.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/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..6431728192872cd01802c6eec0bcb04a709746f6 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;
}
« no previous file with comments | « chrome/browser/fullscreen_aurax11.cc ('k') | chrome/browser/notifications/message_center_notification_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698