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

Unified Diff: chrome/browser/themes/browser_theme_pack.cc

Issue 2360803002: Remove some pre-MD code from toolbar/tabstrip/frame. (Closed)
Patch Set: pkasting review Created 4 years, 3 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
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/themes/theme_properties.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/browser_theme_pack.cc
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc
index 7e76c57be130a19cba2eb31c2785a954b2a764a9..f3e6f1ed962a0c2b6c16750ccd0519ee43c25a1f 100644
--- a/chrome/browser/themes/browser_theme_pack.cc
+++ b/chrome/browser/themes/browser_theme_pack.cc
@@ -107,42 +107,31 @@ struct PersistingImagesTable {
// should be removed once the cocoa port no longer uses them.
PersistingImagesTable kPersistingImages[] = {
{PRS_THEME_FRAME, IDR_THEME_FRAME, "theme_frame"},
- {PRS_THEME_FRAME_INACTIVE,
- IDR_THEME_FRAME_INACTIVE,
+ {PRS_THEME_FRAME_INACTIVE, IDR_THEME_FRAME_INACTIVE,
"theme_frame_inactive"},
- {PRS_THEME_FRAME_INCOGNITO,
- IDR_THEME_FRAME_INCOGNITO,
+ {PRS_THEME_FRAME_INCOGNITO, IDR_THEME_FRAME_INCOGNITO,
"theme_frame_incognito"},
- {PRS_THEME_FRAME_INCOGNITO_INACTIVE,
- IDR_THEME_FRAME_INCOGNITO_INACTIVE,
+ {PRS_THEME_FRAME_INCOGNITO_INACTIVE, IDR_THEME_FRAME_INCOGNITO_INACTIVE,
"theme_frame_incognito_inactive"},
{PRS_THEME_TOOLBAR, IDR_THEME_TOOLBAR, "theme_toolbar"},
- {PRS_THEME_TAB_BACKGROUND,
- IDR_THEME_TAB_BACKGROUND,
+ {PRS_THEME_TAB_BACKGROUND, IDR_THEME_TAB_BACKGROUND,
"theme_tab_background"},
#if !defined(OS_MACOSX)
- {PRS_THEME_TAB_BACKGROUND_INCOGNITO,
- IDR_THEME_TAB_BACKGROUND_INCOGNITO,
+ {PRS_THEME_TAB_BACKGROUND_INCOGNITO, IDR_THEME_TAB_BACKGROUND_INCOGNITO,
"theme_tab_background_incognito"},
#endif
- {PRS_THEME_TAB_BACKGROUND_V,
- IDR_THEME_TAB_BACKGROUND_V,
+ {PRS_THEME_TAB_BACKGROUND_V, IDR_THEME_TAB_BACKGROUND_V,
"theme_tab_background_v"},
- {PRS_THEME_NTP_BACKGROUND,
- IDR_THEME_NTP_BACKGROUND,
+ {PRS_THEME_NTP_BACKGROUND, IDR_THEME_NTP_BACKGROUND,
"theme_ntp_background"},
{PRS_THEME_FRAME_OVERLAY, IDR_THEME_FRAME_OVERLAY, "theme_frame_overlay"},
- {PRS_THEME_FRAME_OVERLAY_INACTIVE,
- IDR_THEME_FRAME_OVERLAY_INACTIVE,
+ {PRS_THEME_FRAME_OVERLAY_INACTIVE, IDR_THEME_FRAME_OVERLAY_INACTIVE,
"theme_frame_overlay_inactive"},
- {PRS_THEME_BUTTON_BACKGROUND,
- IDR_THEME_BUTTON_BACKGROUND,
+ {PRS_THEME_BUTTON_BACKGROUND, IDR_THEME_BUTTON_BACKGROUND,
"theme_button_background"},
- {PRS_THEME_NTP_ATTRIBUTION,
- IDR_THEME_NTP_ATTRIBUTION,
+ {PRS_THEME_NTP_ATTRIBUTION, IDR_THEME_NTP_ATTRIBUTION,
"theme_ntp_attribution"},
- {PRS_THEME_WINDOW_CONTROL_BACKGROUND,
- IDR_THEME_WINDOW_CONTROL_BACKGROUND,
+ {PRS_THEME_WINDOW_CONTROL_BACKGROUND, IDR_THEME_WINDOW_CONTROL_BACKGROUND,
"theme_window_control_background"},
// The rest of these entries have no key because they can't be overridden
@@ -155,9 +144,11 @@ PersistingImagesTable kPersistingImages[] = {
{20, IDR_FORWARD_D, NULL},
{21, IDR_FORWARD_H, NULL},
{22, IDR_FORWARD_P, NULL},
+#if defined(OS_MACOSX)
{23, IDR_HOME, NULL},
{24, IDR_HOME_H, NULL},
{25, IDR_HOME_P, NULL},
+#endif
{26, IDR_RELOAD, NULL},
{27, IDR_RELOAD_H, NULL},
{28, IDR_RELOAD_P, NULL},
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/themes/theme_properties.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698