chrome: Rename WrenchToolbarButtonCell to AppToolbarButtonCell.

The wrench icon has been gone for a long time now, the new icon is a
sideways ellipsis called browser_tools. And it is now known by app menu.

BUG=None
R=pkasting@chromium.org,avi@chromium.org
TBR=thestig@chromium.org

Review URL: https://codereview.chromium.org/1479333002

Cr-Commit-Position: refs/heads/master@{#362530}

8 files changed, 31 insertions, 31 deletions

diff --git a/chrome/app/nibs/Toolbar.xib b/chrome/app/nibs/Toolbar.xib
index f77a844..4eaf6c93 100644
--- a/chrome/app/nibs/Toolbar.xib
+++ b/chrome/app/nibs/Toolbar.xib
@@ -27,7 +27,7 @@
                 <button toolTip="^IDS_APPMENU_TOOLTIP" id="38" customClass="MenuButton">
                     <rect key="frame" x="572" y="4" width="29" height="29"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="39" customClass="WrenchToolbarButtonCell">
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" imagePosition="only" alignment="center" borderStyle="border" inset="2" id="39" customClass="AppToolbarButtonCell">
                         <behavior key="behavior" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
diff --git a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h
index ce5f0312..6e5eb1c 100644
--- a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_WRENCH_TOOLBAR_BUTTON_CELL_H_
-#define CHROME_BROWSER_UI_COCOA_TOOLBAR_WRENCH_TOOLBAR_BUTTON_CELL_H_
+#ifndef CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_CELL_H_
+#define CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_CELL_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -13,9 +13,9 @@
 
 class AppMenuIconPainterDelegateMac;
 
-// Cell for the wrench toolbar button. This is used to draw the app menu icon
+// Cell for the app toolbar button. This is used to draw the app menu icon
 // and paint severity levels.
-@interface WrenchToolbarButtonCell : ClickHoldButtonCell {
+@interface AppToolbarButtonCell : ClickHoldButtonCell {
  @private
   scoped_ptr<AppMenuIconPainter> iconPainter_;
   scoped_ptr<AppMenuIconPainterDelegateMac> delegate_;
@@ -26,4 +26,4 @@ class AppMenuIconPainterDelegateMac;
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_TOOLBAR_WRENCH_TOOLBAR_BUTTON_CELL_H_
+#endif  // CHROME_BROWSER_UI_COCOA_TOOLBAR_APP_TOOLBAR_BUTTON_CELL_H_
diff --git a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm
index 1668127..3034482 100644
--- a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
+#import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
 
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #include "ui/gfx/canvas_skia_paint.h"
@@ -23,12 +23,12 @@ class AppMenuIconPainterDelegateMac : public AppMenuIconPainter::Delegate {
   DISALLOW_COPY_AND_ASSIGN(AppMenuIconPainterDelegateMac);
 };
 
-@interface WrenchToolbarButtonCell ()
+@interface AppToolbarButtonCell ()
 - (void)commonInit;
 - (AppMenuIconPainter::BezelType)currentBezelType;
 @end
 
-@implementation WrenchToolbarButtonCell
+@implementation AppToolbarButtonCell
 
 - (id)initTextCell:(NSString*)text {
   if ((self = [super initTextCell:text])) {
diff --git a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell_unittest.mm b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm
index 31e9667..8b2ba97 100644
--- a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm
@@ -2,37 +2,37 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
+#import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
 
 #include "base/message_loop/message_loop.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 
-@interface TestWrenchToolbarButton : NSButton
+@interface TestAppToolbarButton : NSButton
 @end
 
-@implementation TestWrenchToolbarButton
+@implementation TestAppToolbarButton
 
 + (Class)cellClass {
-  return [WrenchToolbarButtonCell class];
+  return [AppToolbarButtonCell class];
 }
 
 @end
 
-class WrenchToolbarButtonCellTest : public CocoaTest {
+class AppToolbarButtonCellTest : public CocoaTest {
  protected:
-  WrenchToolbarButtonCellTest() {
-    base::scoped_nsobject<NSButton> button([[TestWrenchToolbarButton alloc]
+  AppToolbarButtonCellTest() {
+    base::scoped_nsobject<NSButton> button([[TestAppToolbarButton alloc]
         initWithFrame:NSMakeRect(0, 0, 29, 29)]);
     button_ = button;
     [[test_window() contentView] addSubview:button_];
   }
 
   NSButton* button_;
-  base::scoped_nsobject<WrenchToolbarButtonCell> cell_;
+  base::scoped_nsobject<AppToolbarButtonCell> cell_;
   base::MessageLoopForUI message_loop_;  // Needed for gfx::Animation.
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(WrenchToolbarButtonCellTest);
+  DISALLOW_COPY_AND_ASSIGN(AppToolbarButtonCellTest);
 };
 
-TEST_VIEW(WrenchToolbarButtonCellTest, button_)
+TEST_VIEW(AppToolbarButtonCellTest, button_)
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index 21881cb..5fd4f66 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -38,11 +38,11 @@
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/menu_button.h"
+#import "chrome/browser/ui/cocoa/toolbar/app_toolbar_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/back_forward_menu_controller.h"
 #import "chrome/browser/ui/cocoa/toolbar/reload_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_view_cocoa.h"
-#import "chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/app_menu_badge_controller.h"
@@ -674,8 +674,8 @@ class NotificationBridge : public AppMenuBadgeController::Delegate {
 
 - (void)updateWrenchButtonSeverity:(AppMenuIconPainter::Severity)severity
                            animate:(BOOL)animate {
-  WrenchToolbarButtonCell* cell =
-      base::mac::ObjCCastStrict<WrenchToolbarButtonCell>([wrenchButton_ cell]);
+  AppToolbarButtonCell* cell =
+      base::mac::ObjCCastStrict<AppToolbarButtonCell>([wrenchButton_ cell]);
   [cell setSeverity:severity shouldAnimate:animate];
 }
 
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index bf7b458..38e8c5e 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -113,13 +113,13 @@
       'browser/ui/passwords/manage_passwords_ui_controller.h',
       'browser/ui/passwords/manage_passwords_view_utils.cc',
       'browser/ui/passwords/manage_passwords_view_utils.h',
+      'browser/ui/passwords/password_manager_presenter.cc',
+      'browser/ui/passwords/password_manager_presenter.h',
+      'browser/ui/passwords/password_ui_view.h',
       'browser/ui/passwords/passwords_client_ui_delegate.cc',
       'browser/ui/passwords/passwords_client_ui_delegate.h',
       'browser/ui/passwords/passwords_model_delegate.cc',
       'browser/ui/passwords/passwords_model_delegate.h',
-      'browser/ui/passwords/password_manager_presenter.cc',
-      'browser/ui/passwords/password_manager_presenter.h',
-      'browser/ui/passwords/password_ui_view.h',
       'browser/ui/platform_keys_certificate_selector_chromeos.h',
       'browser/ui/prefs/prefs_tab_helper.cc',
       'browser/ui/prefs/prefs_tab_helper.h',
@@ -1244,6 +1244,8 @@
       'browser/ui/cocoa/task_manager_mac.mm',
       'browser/ui/cocoa/themed_window.h',
       'browser/ui/cocoa/themed_window.mm',
+      'browser/ui/cocoa/toolbar/app_toolbar_button_cell.h',
+      'browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm',
       'browser/ui/cocoa/toolbar/back_forward_menu_controller.h',
       'browser/ui/cocoa/toolbar/back_forward_menu_controller.mm',
       'browser/ui/cocoa/toolbar/media_router_action_platform_delegate_cocoa.h',
@@ -1256,8 +1258,6 @@
       'browser/ui/cocoa/toolbar/toolbar_controller.mm',
       'browser/ui/cocoa/toolbar/toolbar_view_cocoa.h',
       'browser/ui/cocoa/toolbar/toolbar_view_cocoa.mm',
-      'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h',
-      'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm',
       'browser/ui/cocoa/translate/translate_bubble_controller.h',
       'browser/ui/cocoa/translate/translate_bubble_controller.mm',
       'browser/ui/cocoa/url_drop_target.h',
diff --git a/chrome/chrome_nibs.gyp b/chrome/chrome_nibs.gyp
index d0f5dd89..25cc634 100644
--- a/chrome/chrome_nibs.gyp
+++ b/chrome/chrome_nibs.gyp
@@ -221,6 +221,8 @@
         'browser/ui/cocoa/task_manager_mac.mm',
         'browser/ui/cocoa/themed_window.h',
         'browser/ui/cocoa/themed_window.mm',
+        'browser/ui/cocoa/toolbar/app_toolbar_button_cell.h',
+        'browser/ui/cocoa/toolbar/app_toolbar_button_cell.mm',
         'browser/ui/cocoa/toolbar/reload_button.h',
         'browser/ui/cocoa/toolbar/reload_button.mm',
         'browser/ui/cocoa/toolbar/toolbar_button.h',
@@ -229,8 +231,6 @@
         'browser/ui/cocoa/toolbar/toolbar_controller.mm',
         'browser/ui/cocoa/toolbar/toolbar_view.h',
         'browser/ui/cocoa/toolbar/toolbar_view.mm',
-        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.h',
-        'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm',
         'browser/ui/cocoa/ui_localizer.h',
         'browser/ui/cocoa/ui_localizer.mm',
         'browser/ui/cocoa/vertical_gradient_view.h',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 34b90c5..c584f1a 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -196,8 +196,8 @@
       'browser/profiles/profile_info_cache_unittest.cc',
       'browser/profiles/profile_info_cache_unittest.h',
       'browser/profiles/profile_manager_unittest.cc',
-      'browser/profiles/profile_statistics_unittest.cc',
       'browser/profiles/profile_shortcut_manager_unittest_win.cc',
+      'browser/profiles/profile_statistics_unittest.cc',
       'browser/push_messaging/push_messaging_app_identifier_unittest.cc',
       'browser/push_messaging/push_messaging_notification_manager_unittest.cc',
       'browser/push_messaging/push_messaging_permission_context_unittest.cc',
@@ -436,11 +436,11 @@
       'browser/ui/cocoa/tabs/tab_strip_view_unittest.mm',
       'browser/ui/cocoa/tabs/tab_view_unittest.mm',
       'browser/ui/cocoa/task_manager_mac_unittest.mm',
+      'browser/ui/cocoa/toolbar/app_toolbar_button_cell_unittest.mm',
       'browser/ui/cocoa/toolbar/reload_button_unittest.mm',
       'browser/ui/cocoa/toolbar/toolbar_button_unittest.mm',
       'browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm',
       'browser/ui/cocoa/toolbar/toolbar_view_unittest.mm',
-      'browser/ui/cocoa/toolbar/wrench_toolbar_button_cell_unittest.mm',
       'browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm',
       'browser/ui/cocoa/validation_message_bubble_controller_unittest.mm',
       'browser/ui/cocoa/vertical_gradient_view_unittest.mm',