Remove some pre-MD code from toolbar/tabstrip/frame.

chrome/browser/themes/browser_theme_pack.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/browser_theme_pack.h"
 
 #include <limits.h>
 #include <stddef.h>
 
 #include <limits>
@@ skipping 89 matching lines @@
   const char* const key;
 };
 
 // IDR_* resource names change whenever new resources are added; use persistent
 // IDs when storing to a cached pack.
 //
 // TODO(erg): The cocoa port is the last user of the IDR_*_[HP] variants. These
 // 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
     // from the json manifest.
     {15, IDR_BACK, NULL},
     {16, IDR_BACK_D, NULL},
     {17, IDR_BACK_H, NULL},
     {18, IDR_BACK_P, NULL},
     {19, IDR_FORWARD, NULL},
     {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},
     {29, IDR_STOP, NULL},
     {30, IDR_STOP_D, NULL},
     {31, IDR_STOP_H, NULL},
     {32, IDR_STOP_P, NULL},
     {33, IDR_TOOLS, NULL},
     {34, IDR_TOOLS_H, NULL},
     {35, IDR_TOOLS_P, NULL},
@@ skipping 1370 matching lines @@
                                            false,
                                            &bitmap_data)) {
       NOTREACHED() << "Unable to encode theme image for prs_id="
                    << prs_id << " for scale_factor=" << scale_factors_[i];
       break;
     }
     image_memory_[scaled_raw_id] =
         base::RefCountedBytes::TakeVector(&bitmap_data);
   }
 }