chrome: move the remaining files from wrench_menu into app_menu

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
NOPRESUBMIT=true

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

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

13 files changed, 27 insertions, 26 deletions

diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.h b/chrome/browser/ui/cocoa/accelerators_cocoa.h
index 5c89619..d736814 100644
--- a/chrome/browser/ui/cocoa/accelerators_cocoa.h
+++ b/chrome/browser/ui/cocoa/accelerators_cocoa.h
@@ -20,7 +20,7 @@ struct DefaultSingletonTraits;
 
 // This class maintains a map of command_ids to Accelerator objects (see
 // chrome/app/chrome_command_ids.h). Currently, this only lists the commands
-// that are used in the Wrench menu.
+// that are used in the App menu.
 //
 // It is recommended that this class be used as a singleton so that the key map
 // isn't created multiple places.
@@ -59,7 +59,7 @@ class AcceleratorsCocoa {
 
   // A map from command_id to Accelerator. The accelerator is fully filled out,
   // and its platform_accelerator is also fully filled out.
-  // Contains accelerators from both the wrench menu and the main menu.
+  // Contains accelerators from both the app menu and the main menu.
   AcceleratorMap accelerators_;
   // A list of accelerators used in the main menu that have no associated
   // command_id. The accelerator is fully filled out, and its
diff --git a/chrome/browser/ui/cocoa/wrench_menu/OWNERS b/chrome/browser/ui/cocoa/app_menu/OWNERS
index 14fce2a..14fce2a 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/OWNERS
+++ b/chrome/browser/ui/cocoa/app_menu/OWNERS
diff --git a/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm b/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
index 7119c25..8574e16 100644
--- a/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/app_menu/app_menu_controller.mm
@@ -15,6 +15,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/accelerators_cocoa.h"
+#import "chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h"
+#import "chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ -23,8 +25,6 @@
 #import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
 #import "chrome/browser/ui/cocoa/l10n_util.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
-#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
-#import "chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h"
 #include "chrome/browser/ui/toolbar/app_menu_model.h"
 #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h"
diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h b/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.h
index 528d8b8..0fbc5127 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h
+++ b/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.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_WRENCH_MENU_MENU_TRACKED_BUTTON_H_
-#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_BUTTON_H_
+#ifndef CHROME_BROWSER_UI_COCOA_APP_MENU_MENU_TRACKED_BUTTON_H_
+#define CHROME_BROWSER_UI_COCOA_APP_MENU_MENU_TRACKED_BUTTON_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -39,4 +39,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_BUTTON_H_
+#endif  // CHROME_BROWSER_UI_COCOA_APP_MENU_MENU_TRACKED_BUTTON_H_
diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm b/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.mm
index e7da3df..40dfcb4 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm
+++ b/chrome/browser/ui/cocoa/app_menu/menu_tracked_button.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/wrench_menu/menu_tracked_button.h"
+#import "chrome/browser/ui/cocoa/app_menu/menu_tracked_button.h"
 
 @interface MenuTrackedButton (Private)
 - (void)doHighlight:(BOOL)highlight;
diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h b/chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h
index 7dc4bff..8565518 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h
+++ b/chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.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_WRENCH_MENU_MENU_TRACKED_ROOT_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_ROOT_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_APP_MENU_MENU_TRACKED_ROOT_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_APP_MENU_MENU_TRACKED_ROOT_VIEW_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -21,4 +21,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_ROOT_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_APP_MENU_MENU_TRACKED_ROOT_VIEW_H_
diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm b/chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.mm
index 96b3b26..d9790e9 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm
+++ b/chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.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/wrench_menu/menu_tracked_root_view.h"
+#import "chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h"
 
 @implementation MenuTrackedRootView
 
diff --git a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm b/chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm
index 924b942..57accc1 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm
@@ -5,8 +5,8 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
+#import "chrome/browser/ui/cocoa/app_menu/menu_tracked_root_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h b/chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h
index 774979a..0ad657a 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h
+++ b/chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h
@@ -2,12 +2,13 @@
 // 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_WRENCH_MENU_RECENT_TABS_MENU_MODEL_DELEGATE_H_
-#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_RECENT_TABS_MENU_MODEL_DELEGATE_H_
+#ifndef CHROME_BROWSER_UI_COCOA_APP_MENU_RECENT_TABS_MENU_MODEL_DELEGATE_H_
+#define CHROME_BROWSER_UI_COCOA_APP_MENU_RECENT_TABS_MENU_MODEL_DELEGATE_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
+#include "base/macros.h"
 #include "ui/base/models/menu_model_delegate.h"
 
 namespace ui {
@@ -31,4 +32,4 @@ class RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
   DISALLOW_COPY_AND_ASSIGN(RecentTabsMenuModelDelegate);
 };
 
-#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_RECENT_TABS_MENU_MODEL_DELEGATE_H_
+#endif  // CHROME_BROWSER_UI_COCOA_APP_MENU_RECENT_TABS_MENU_MODEL_DELEGATE_H_
diff --git a/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.mm b/chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.mm
index fdcaec3..e4cbd71 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.mm
+++ b/chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.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/wrench_menu/recent_tabs_menu_model_delegate.h"
+#import "chrome/browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/image/image.h"
 
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 773aeeb..3fca748 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -733,6 +733,12 @@
       'browser/ui/cocoa/app_menu/app_menu_button_cell.mm',
       'browser/ui/cocoa/app_menu/app_menu_controller.h',
       'browser/ui/cocoa/app_menu/app_menu_controller.mm',
+      'browser/ui/cocoa/app_menu/menu_tracked_button.h',
+      'browser/ui/cocoa/app_menu/menu_tracked_button.mm',
+      'browser/ui/cocoa/app_menu/menu_tracked_root_view.h',
+      'browser/ui/cocoa/app_menu/menu_tracked_root_view.mm',
+      'browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.h',
+      'browser/ui/cocoa/app_menu/recent_tabs_menu_model_delegate.mm',
       'browser/ui/cocoa/applescript/apple_event_util.h',
       'browser/ui/cocoa/applescript/apple_event_util.mm',
       'browser/ui/cocoa/applescript/bookmark_folder_applescript.h',
@@ -1276,12 +1282,6 @@
       'browser/ui/cocoa/website_settings/website_settings_utils_cocoa.mm',
       'browser/ui/cocoa/window_size_autosaver.h',
       'browser/ui/cocoa/window_size_autosaver.mm',
-      'browser/ui/cocoa/wrench_menu/menu_tracked_button.h',
-      'browser/ui/cocoa/wrench_menu/menu_tracked_button.mm',
-      'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h',
-      'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm',
-      'browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h',
-      'browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.mm',
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
     'chrome_browser_ui_desktop_sources': [
diff --git a/chrome/chrome_nibs.gyp b/chrome/chrome_nibs.gyp
index 8d8f6ed..d0f5dd89 100644
--- a/chrome/chrome_nibs.gyp
+++ b/chrome/chrome_nibs.gyp
@@ -55,6 +55,8 @@
         'browser/ui/cocoa/animatable_view.mm',
         'browser/ui/cocoa/app_menu/app_menu_controller.h',
         'browser/ui/cocoa/app_menu/app_menu_controller.mm',
+        'browser/ui/cocoa/app_menu/menu_tracked_root_view.h',
+        'browser/ui/cocoa/app_menu/menu_tracked_root_view.mm',
         'browser/ui/cocoa/background_gradient_view.h',
         'browser/ui/cocoa/background_gradient_view.mm',
         'browser/ui/cocoa/base_bubble_controller.h',
@@ -235,8 +237,6 @@
         'browser/ui/cocoa/vertical_gradient_view.mm',
         'browser/ui/cocoa/view_id_util.h',
         'browser/ui/cocoa/view_id_util.mm',
-        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h',
-        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm',
       ],
       'mac_bundle_resources': [
         '<@(mac_all_xibs)',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 1171d04..7f9f754 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -266,6 +266,7 @@
       'browser/ui/cocoa/animatable_view_unittest.mm',
       'browser/ui/cocoa/app_menu/app_menu_button_cell_unittest.mm',
       'browser/ui/cocoa/app_menu/app_menu_controller_unittest.mm',
+      'browser/ui/cocoa/app_menu/menu_tracked_root_view_unittest.mm',
       'browser/ui/cocoa/applescript/apple_event_util_unittest.mm',
       'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h',
       'browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.mm',
@@ -446,7 +447,6 @@
       'browser/ui/cocoa/website_settings/permission_selector_button_unittest.mm',
       'browser/ui/cocoa/website_settings/website_settings_bubble_controller_unittest.mm',
       'browser/ui/cocoa/window_size_autosaver_unittest.mm',
-      'browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm',
       'browser/ui/find_bar/find_backend_unittest.cc',
       'browser/ui/login/login_prompt_unittest.cc',
       'browser/ui/passwords/manage_passwords_state_unittest.cc',