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

Unified Diff: trunk/src/chrome/browser/ui/libgtk2ui/gtk2_ui.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/ui/libgtk2ui/gtk2_ui.cc
===================================================================
--- trunk/src/chrome/browser/ui/libgtk2ui/gtk2_ui.cc (revision 269901)
+++ trunk/src/chrome/browser/ui/libgtk2ui/gtk2_ui.cc (working copy)
@@ -120,17 +120,10 @@
const color_utils::HSL kDefaultTintBackgroundTab = { -1, 0.5, 0.75 };
// A list of images that we provide while in gtk mode.
-//
-// TODO(erg): We list both the normal and *_DESKTOP versions of some of these
-// images because in some contexts, we don't go through the
-// chrome::MapThemeImage interface. That should be fixed, but tracking that
-// down is Hard.
const int kThemeImages[] = {
IDR_THEME_TOOLBAR,
IDR_THEME_TAB_BACKGROUND,
- IDR_THEME_TAB_BACKGROUND_DESKTOP,
IDR_THEME_TAB_BACKGROUND_INCOGNITO,
- IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP,
IDR_FRAME,
IDR_FRAME_INACTIVE,
IDR_THEME_FRAME,
@@ -1047,10 +1040,8 @@
return bitmap;
}
case IDR_THEME_TAB_BACKGROUND:
- case IDR_THEME_TAB_BACKGROUND_DESKTOP:
return GenerateTabImage(IDR_THEME_FRAME);
case IDR_THEME_TAB_BACKGROUND_INCOGNITO:
- case IDR_THEME_TAB_BACKGROUND_INCOGNITO_DESKTOP:
return GenerateTabImage(IDR_THEME_FRAME_INCOGNITO);
case IDR_FRAME:
case IDR_THEME_FRAME:

Powered by Google App Engine
This is Rietveld 408576698