Modified resources for M6 theme. This doesn't actually modify layout yet, just images and identifier names.

BUG=50107
TEST=none
Review URL: http://codereview.chromium.org/3035034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53993 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 52 insertions, 25 deletions

diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 2e4d0fd..9e4e793 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -136,7 +136,7 @@ be available for now. -->
           Chromium OS
         </message>
       </if>
-      <if expr="os == 'win32'">
+      <if expr="os.find('win') != -1">
         <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name">
           Chromium Frame
         </message>
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index d5f5f33..b9299f7 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -186,7 +186,7 @@ Chrome supports. -->
           Google Chrome OS
         </message>
       </if>
-      <if expr="os == 'win32'">
+      <if expr="os.find('win') != -1">
         <message name="IDS_PRODUCT_FRAME_NAME" desc="The Chrome Frame application name">
           Google Chrome Frame
         </message>
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index cba7802..e14bd07 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -29,7 +29,8 @@
       <include name="IDR_BALLOON_CLOSE" file="balloon_close.png" type="BINDATA" />
       <include name="IDR_BALLOON_CLOSE_HOVER" file="balloon_close_hover.png" type="BINDATA" />
       <include name="IDR_BALLOON_WRENCH" file="notification_wrench.png" type="BINDATA" />
-      <include name="IDR_BALLOON_WRENCH_HOVER" file="notification_wrench_h.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH_H" file="notification_wrench_h.png" type="BINDATA" />
+      <include name="IDR_BALLOON_WRENCH_P" file="notification_wrench_p.png" type="BINDATA" />
       <include name="IDR_BLOCKED_COOKIES" file="blocked_cookies.png" type="BINDATA" />
       <include name="IDR_BLOCKED_IMAGES" file="blocked_images.png" type="BINDATA" />
       <include name="IDR_BLOCKED_JAVASCRIPT" file="blocked_script.png" type="BINDATA" />
@@ -43,6 +44,19 @@
       <if expr="os == 'darwin'">
         <include name="IDR_BOOKMARK_BAR_FOLDER" file="bookmark_bar_folder_mac.png" type="BINDATA" />
       </if>
+      <include name="IDR_BROWSER_ACTION" file="browser_action.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_H" file="browser_action_h.png" type="BINDATA" />
+      <include name="IDR_BROWSER_ACTION_P" file="browser_action_p.png" type="BINDATA" />
+      <if expr="os.find('win') == -1">
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_h.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_p.png" type="BINDATA" />
+      </if>
+      <if expr="os.find('win') != -1">
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW" file="browser_actions_overflow_win.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_H" file="browser_actions_overflow_win_h.png" type="BINDATA" />
+        <include name="IDR_BROWSER_ACTIONS_OVERFLOW_P" file="browser_actions_overflow_win_p.png" type="BINDATA" />
+      </if>
       <include name="IDR_BUBBLE_B" file="bubble_b.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BL" file="bubble_bl.png" type="BINDATA" />
       <include name="IDR_BUBBLE_BR" file="bubble_br.png" type="BINDATA" />
@@ -171,6 +185,7 @@
       </if>
       <include name="IDR_INFO_BUBBLE_CLOSE" file="bubble_close.png" type="BINDATA" />
       <include name="IDR_INPUT_ALERT" file="input_alert.png" type="BINDATA" />
+      <include name="IDR_KEYWORD_SEARCH_MAGNIFIER" file="keyword_search_magnifier.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_C" file="omnibox_c.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_L" file="omnibox_l.png" type="BINDATA" />
       <include name="IDR_LOCATIONBG_POPUPMODE_CENTER" file="omnibox_popup_c.png" type="BINDATA" />
@@ -221,7 +236,6 @@
       <include name="IDR_OMNIBOX_SEARCH_SELECTED" file="omnibox_search_selected.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_STAR" file="omnibox_star.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_STAR_DARK" file="omnibox_star_dark.png" type="BINDATA" />
-      <include name="IDR_OMNIBOX_STAR_LIT" file="omnibox_star_lit.png" type="BINDATA" />
       <include name="IDR_OMNIBOX_STAR_SELECTED" file="omnibox_star_selected.png" type="BINDATA" />
       <include name="IDR_OTR_ICON" file="otr_icon.png" type="BINDATA" />
       <include name="IDR_PAGEINFO_BAD" file="pageinfo_bad.png" type="BINDATA" />
@@ -316,6 +330,8 @@
         <include name="IDR_SEARCH_ENGINE_LOGO_ZOZNAM" file="notused.png" type="BINDATA" />
       </if>
       <include name="IDR_SIDETABS_NEW_TAB" file="sidetabs_new_tab.png" type="BINDATA" />
+      <include name="IDR_STAR" file="star.png" type="BINDATA" />
+      <include name="IDR_STAR_LIT" file="star_lit.png" type="BINDATA" />
       <if expr="pp_ifdef('_google_chrome') and (os == 'darwin')">
         <include name="IDR_STATUS_TRAY_ICON" file="google_chrome/product_logo_22_mono.png" type="BINDATA" />
         <include name="IDR_STATUS_TRAY_ICON_PRESSED" file="google_chrome/product_logo_22_mono_invert.png" type="BINDATA" />
@@ -385,6 +401,8 @@
       <include name="IDR_THROBBER_WAITING" file="throbber_waiting.png" type="BINDATA" />
       <include name="IDR_THROBBER_WAITING_LIGHT" file="throbber_waiting_light.png" type="BINDATA" />
       <include name="IDR_TOOLS" file="tools.png" type="BINDATA" />
+      <include name="IDR_TOOLS_H" file="tools_h.png" type="BINDATA" />
+      <include name="IDR_TOOLS_P" file="tools_p.png" type="BINDATA" />
       <include name="IDR_UPDATE_AVAILABLE" file="update_available.png" type="BINDATA" />
       <include name="IDR_UPDATE_FAIL" file="update_fail.png" type="BINDATA" />
       <include name="IDR_UPDATE_UPTODATE" file="update_uptodate.png" type="BINDATA" />
diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index 736525d..fcf882e 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -126,8 +126,8 @@ NSImage* AutocompleteEditViewMac::ImageForResource(int resource_id) {
   switch(resource_id) {
     // From the autocomplete popup, or the star icon at the RHS of the
     // text field.
-    case IDR_OMNIBOX_STAR: image_name = @"omnibox_star.pdf"; break;
-    case IDR_OMNIBOX_STAR_LIT: image_name = @"omnibox_star_lit.pdf"; break;
+    case IDR_STAR: image_name = @"star.pdf"; break;
+    case IDR_STAR_LIT: image_name = @"star_lit.pdf"; break;
 
     // Values from |AutocompleteMatch::TypeToIcon()|.
     case IDR_OMNIBOX_SEARCH: image_name = @"omnibox_search.pdf"; break;
diff --git a/chrome/browser/browser_theme_pack.cc b/chrome/browser/browser_theme_pack.cc
index 7e1dc8e..943b1e8 100644
--- a/chrome/browser/browser_theme_pack.cc
+++ b/chrome/browser/browser_theme_pack.cc
@@ -23,7 +23,7 @@ namespace {
 
 // Version number of the current theme pack. We just throw out and rebuild
 // theme packs that aren't int-equal to this.
-const int kThemePackVersion = 13;
+const int kThemePackVersion = 14;
 
 // IDs that are in the DataPack won't clash with the positive integer
 // int32_t. kHeaderID should always have the maximum value because we want the
@@ -131,11 +131,16 @@ PersistingImagesTable kPersistingImages[] = {
   { 32, IDR_LOCATIONBG_C, NULL },
   { 33, IDR_LOCATIONBG_L, NULL },
   { 34, IDR_LOCATIONBG_R, NULL },
-  { 35, IDR_TOOLS, NULL },
-  { 36, IDR_MENU_DROPARROW, NULL },
-  { 37, IDR_THROBBER, NULL },
-  { 38, IDR_THROBBER_WAITING, NULL },
-  { 39, IDR_THROBBER_LIGHT, NULL },
+  { 35, IDR_BROWSER_ACTIONS_OVERFLOW, NULL },
+  { 36, IDR_BROWSER_ACTIONS_OVERFLOW_H, NULL },
+  { 37, IDR_BROWSER_ACTIONS_OVERFLOW_P, NULL },
+  { 38, IDR_TOOLS, NULL },
+  { 39, IDR_TOOLS_H, NULL },
+  { 40, IDR_TOOLS_P, NULL },
+  { 41, IDR_MENU_DROPARROW, NULL },
+  { 42, IDR_THROBBER, NULL },
+  { 43, IDR_THROBBER_WAITING, NULL },
+  { 44, IDR_THROBBER_LIGHT, NULL },
 };
 
 int GetPersistentIDByName(const std::string& key) {
diff --git a/chrome/browser/browser_theme_provider.cc b/chrome/browser/browser_theme_provider.cc
index edc43f3..9c39ce1 100644
--- a/chrome/browser/browser_theme_provider.cc
+++ b/chrome/browser/browser_theme_provider.cc
@@ -147,7 +147,9 @@ const int kToolbarButtonIDs[] = {
   IDR_RELOAD, IDR_RELOAD_H, IDR_RELOAD_P,
   IDR_STOP, IDR_STOP_H, IDR_STOP_P,
   IDR_LOCATIONBG_C, IDR_LOCATIONBG_L, IDR_LOCATIONBG_R,
-  IDR_TOOLS,
+  IDR_BROWSER_ACTIONS_OVERFLOW, IDR_BROWSER_ACTIONS_OVERFLOW_H,
+  IDR_BROWSER_ACTIONS_OVERFLOW_P,
+  IDR_TOOLS, IDR_TOOLS_H, IDR_TOOLS_P,
   IDR_MENU_DROPARROW,
   IDR_THROBBER, IDR_THROBBER_WAITING, IDR_THROBBER_LIGHT,
 };
diff --git a/chrome/browser/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/cocoa/location_bar/selected_keyword_decoration.mm
index 3c593ac..9d18bcb 100644
--- a/chrome/browser/cocoa/location_bar/selected_keyword_decoration.mm
+++ b/chrome/browser/cocoa/location_bar/selected_keyword_decoration.mm
@@ -14,8 +14,8 @@
 
 SelectedKeywordDecoration::SelectedKeywordDecoration(NSFont* font)
     : BubbleDecoration(font) {
-  search_image_.reset(
-      [AutocompleteEditViewMac::ImageForResource(IDR_OMNIBOX_SEARCH) retain]);
+  search_image_.reset([AutocompleteEditViewMac::ImageForResource(
+      IDR_KEYWORD_SEARCH_MAGNIFIER) retain]);
 
   // Matches the color of the highlighted line in the popup.
   NSColor* background_color = [NSColor selectedControlColor];
diff --git a/chrome/browser/cocoa/location_bar/star_decoration.mm b/chrome/browser/cocoa/location_bar/star_decoration.mm
index 1015f58..f2c6948 100644
--- a/chrome/browser/cocoa/location_bar/star_decoration.mm
+++ b/chrome/browser/cocoa/location_bar/star_decoration.mm
@@ -30,7 +30,7 @@ StarDecoration::~StarDecoration() {
 }
 
 void StarDecoration::SetStarred(bool starred) {
-  const int image_id = starred ? IDR_OMNIBOX_STAR_LIT : IDR_OMNIBOX_STAR;
+  const int image_id = starred ? IDR_STAR_LIT : IDR_STAR;
   const int tip_id = starred ? IDS_TOOLTIP_STARRED : IDS_TOOLTIP_STAR;
   SetImage(AutocompleteEditViewMac::ImageForResource(image_id));
   tooltip_.reset([l10n_util::GetNSStringWithFixup(tip_id) retain]);
diff --git a/chrome/browser/gtk/location_bar_view_gtk.cc b/chrome/browser/gtk/location_bar_view_gtk.cc
index 24c7151..c357f69 100644
--- a/chrome/browser/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/gtk/location_bar_view_gtk.cc
@@ -209,7 +209,7 @@ void LocationBarViewGtk::Init(bool popup_window_mode) {
   GtkWidget* tab_to_search_hbox = gtk_hbox_new(FALSE, 0);
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   tab_to_search_magnifier_ = gtk_image_new_from_pixbuf(
-      rb.GetPixbufNamed(IDR_OMNIBOX_SEARCH));
+      rb.GetPixbufNamed(IDR_KEYWORD_SEARCH_MAGNIFIER));
   gtk_box_pack_start(GTK_BOX(tab_to_search_hbox), tab_to_search_magnifier_,
                      FALSE, FALSE, 0);
   gtk_util::CenterWidgetInHBox(tab_to_search_hbox, tab_to_search_label_hbox,
@@ -1062,7 +1062,7 @@ void LocationBarViewGtk::UpdateStarIcon() {
 
   gtk_image_set_from_pixbuf(GTK_IMAGE(star_image_),
       theme_provider_->GetPixbufNamed(
-          starred_ ? IDR_OMNIBOX_STAR_LIT : IDR_OMNIBOX_STAR));
+          starred_ ? IDR_STAR_LIT : IDR_STAR));
 }
 
 bool LocationBarViewGtk::ShouldOnlyShowLocation() {
diff --git a/chrome/browser/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/gtk/notifications/balloon_view_gtk.cc
index ea9d9ae..1ab1670 100644
--- a/chrome/browser/gtk/notifications/balloon_view_gtk.cc
+++ b/chrome/browser/gtk/notifications/balloon_view_gtk.cc
@@ -267,7 +267,7 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   close_button_.reset(new CustomDrawButton(IDR_BALLOON_CLOSE,
                                            IDR_BALLOON_CLOSE_HOVER,
                                            IDR_BALLOON_CLOSE_HOVER,
-                                           IDR_BALLOON_CLOSE_HOVER));
+                                           0));
   gtk_widget_set_tooltip_text(close_button_->widget(), dismiss_text.c_str());
   g_signal_connect(close_button_->widget(), "clicked",
                    G_CALLBACK(OnCloseButtonThunk), this);
@@ -281,9 +281,9 @@ void BalloonViewImpl::Show(Balloon* balloon) {
 
   // Create a button for showing the options menu, and add it to the toolbar.
   options_menu_button_.reset(new CustomDrawButton(IDR_BALLOON_WRENCH,
-                                                  IDR_BALLOON_WRENCH_HOVER,
-                                                  IDR_BALLOON_WRENCH_HOVER,
-                                                  IDR_BALLOON_WRENCH_HOVER));
+                                                  IDR_BALLOON_WRENCH_P,
+                                                  IDR_BALLOON_WRENCH_H,
+                                                  0));
   gtk_widget_set_tooltip_text(options_menu_button_->widget(),
                               options_text.c_str());
   g_signal_connect(options_menu_button_->widget(), "clicked",
diff --git a/chrome/browser/views/location_bar/star_view.cc b/chrome/browser/views/location_bar/star_view.cc
index 9dfaf62..06bb843 100644
--- a/chrome/browser/views/location_bar/star_view.cc
+++ b/chrome/browser/views/location_bar/star_view.cc
@@ -31,7 +31,7 @@ void StarView::SetToggled(bool on) {
   // name right after we modify the tooltip text for this view.
   SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_STAR));
   SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
-      on ? IDR_OMNIBOX_STAR_LIT : IDR_OMNIBOX_STAR));
+      on ? IDR_STAR_LIT : IDR_STAR));
 }
 
 bool StarView::GetAccessibleRole(AccessibilityTypes::Role* role) {
diff --git a/chrome/browser/views/notifications/balloon_view.cc b/chrome/browser/views/notifications/balloon_view.cc
index fd7f99c..b1a807d 100644
--- a/chrome/browser/views/notifications/balloon_view.cc
+++ b/chrome/browser/views/notifications/balloon_view.cc
@@ -338,7 +338,8 @@ void BalloonViewImpl::Show(Balloon* balloon) {
   close_button_->SetBounds(GetCloseButtonBounds());
 
   options_menu_button_->SetIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH));
-  options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH));
+  options_menu_button_->SetHoverIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_H));
+  options_menu_button_->SetPushedIcon(*rb.GetBitmapNamed(IDR_BALLOON_WRENCH_P));
   options_menu_button_->set_alignment(views::TextButton::ALIGN_CENTER);
   options_menu_button_->SetBounds(GetOptionsButtonBounds());
 
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 10ecae4..8d19d7c 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -265,10 +265,11 @@
                 'app/theme/omnibox_more.pdf',
                 'app/theme/omnibox_search.pdf',
                 'app/theme/omnibox_star.pdf',
-                'app/theme/omnibox_star_lit.pdf',
                 'app/theme/otr_icon.pdf',
                 'app/theme/popup_window_animation.pdf',
                 'app/theme/reload_Template.pdf',
+                'app/theme/star.pdf',
+                'app/theme/star_lit.pdf',
                 'app/theme/stop_Template.pdf',
                 'app/theme/tools_Template.pdf',
                 'app/theme/upgrade_dot.pdf',