[Mac] Move all the related files for the Wrench menu into a subdir of c/b/u/c/.

BUG=none
TEST=compile and trybots
Review URL: http://codereview.chromium.org/6283005

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

chrome/browser/ui/cocoa/toolbar_controller.mm

@@ -43,7 +43,7 @@
 #import "chrome/browser/ui/cocoa/reload_button.h"
 #import "chrome/browser/ui/cocoa/toolbar_view.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
-#import "chrome/browser/ui/cocoa/wrench_menu_controller.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "chrome/common/notification_details.h"

chrome/browser/ui/cocoa/menu_tracked_button.h → chrome/browser/ui/cocoa/wrench_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_MENU_TRACKED_BUTTON_H_
-#define CHROME_BROWSER_UI_COCOA_MENU_TRACKED_BUTTON_H_
+#ifndef CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_BUTTON_H_
+#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_BUTTON_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -40,4 +40,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_MENU_TRACKED_BUTTON_H_
+#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_BUTTON_H_

chrome/browser/ui/cocoa/menu_tracked_button.mm → chrome/browser/ui/cocoa/wrench_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/menu_tracked_button.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h"
 
 #include <cmath>
 

chrome/browser/ui/cocoa/menu_tracked_button_unittest.mm → chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm

@@ -6,7 +6,7 @@
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/menu_tracked_button.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 

chrome/browser/ui/cocoa/menu_tracked_root_view.h → chrome/browser/ui/cocoa/wrench_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_MENU_TRACKED_ROOT_VIEW_H_
-#define CHROME_BROWSER_UI_COCOA_MENU_TRACKED_ROOT_VIEW_H_
+#ifndef CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_ROOT_VIEW_H_
+#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_ROOT_VIEW_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -22,4 +22,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_MENU_TRACKED_ROOT_VIEW_H_
+#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_MENU_TRACKED_ROOT_VIEW_H_

chrome/browser/ui/cocoa/menu_tracked_root_view.mm → chrome/browser/ui/cocoa/wrench_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/menu_tracked_root_view.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 
 @implementation MenuTrackedRootView
 

chrome/browser/ui/cocoa/menu_tracked_root_view_unittest.mm → chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm

@@ -6,7 +6,7 @@
 
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/menu_tracked_root_view.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"

chrome/browser/ui/cocoa/wrench_menu_button_cell.h → chrome/browser/ui/cocoa/wrench_menu/wrench_menu_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_WRENCH_MENU_BUTTON_CELL_H_
-#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_BUTTON_CELL_H_
+#ifndef CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_BUTTON_CELL_H_
+#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_BUTTON_CELL_H_
 
 #import <Cocoa/Cocoa.h>
 
@@ -16,4 +16,4 @@
 
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_BUTTON_CELL_H_
+#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_BUTTON_CELL_H_

chrome/browser/ui/cocoa/wrench_menu_button_cell.mm → chrome/browser/ui/cocoa/wrench_menu/wrench_menu_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/wrench_menu_button_cell.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h"
 
 #include "base/scoped_nsobject.h"
 

chrome/browser/ui/cocoa/wrench_menu_button_cell_unittest.mm → chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm

@@ -5,7 +5,7 @@
 #include "base/scoped_nsobject.h"
 #include "chrome/app/chrome_command_ids.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-#import "chrome/browser/ui/cocoa/wrench_menu_button_cell.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 

chrome/browser/ui/cocoa/wrench_menu_controller.h → chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.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_CONTROLLER_H_
-#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_
+#define CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
@@ -69,4 +69,4 @@ class ZoomLevelObserver;
 - (void)dispatchCommandInternal:(NSInteger)tag;
 @end
 
-#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_COCOA_WRENCH_MENU_WRENCH_MENU_CONTROLLER_H_

chrome/browser/ui/cocoa/wrench_menu_controller.mm → chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

@@ -2,15 +2,15 @@
 // 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_controller.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background_page_tracker.h"
 #include "chrome/browser/metrics/user_metrics.h"
-#import "chrome/browser/ui/cocoa/menu_tracked_root_view.h"
 #import "chrome/browser/ui/cocoa/toolbar_controller.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"

chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm → chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

@@ -7,8 +7,8 @@
 #include "chrome/browser/ui/cocoa/browser_test_helper.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/toolbar_controller.h"
-#import "chrome/browser/ui/cocoa/wrench_menu_controller.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
+#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

chrome/chrome_browser.gypi

@@ -2951,10 +2951,6 @@
         'browser/ui/cocoa/menu_button.mm',
         'browser/ui/cocoa/menu_controller.h',
         'browser/ui/cocoa/menu_controller.mm',
-        'browser/ui/cocoa/menu_tracked_button.h',
-        'browser/ui/cocoa/menu_tracked_button.mm',
-        'browser/ui/cocoa/menu_tracked_root_view.h',
-        'browser/ui/cocoa/menu_tracked_root_view.mm',
         'browser/ui/cocoa/multi_key_equivalent_button.h',
         'browser/ui/cocoa/multi_key_equivalent_button.mm',
         'browser/ui/cocoa/new_tab_button.h',
@@ -3079,10 +3075,14 @@
         'browser/ui/cocoa/web_drop_target.mm',
         'browser/ui/cocoa/window_size_autosaver.h',
         'browser/ui/cocoa/window_size_autosaver.mm',
-        'browser/ui/cocoa/wrench_menu_button_cell.h',
-        'browser/ui/cocoa/wrench_menu_button_cell.mm',
-        'browser/ui/cocoa/wrench_menu_controller.h',
-        'browser/ui/cocoa/wrench_menu_controller.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/wrench_menu_button_cell.h',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
         'browser/ui/find_bar/find_bar.h',
         'browser/ui/find_bar/find_bar_controller.cc',
         'browser/ui/find_bar/find_bar_controller.h',

chrome/chrome_tests.gypi

@@ -1548,8 +1548,6 @@
         'browser/ui/cocoa/location_bar/selected_keyword_decoration_unittest.mm',
         'browser/ui/cocoa/menu_button_unittest.mm',
         'browser/ui/cocoa/menu_controller_unittest.mm',
-        'browser/ui/cocoa/menu_tracked_button_unittest.mm',
-        'browser/ui/cocoa/menu_tracked_root_view_unittest.mm',
         'browser/ui/cocoa/notifications/balloon_controller_unittest.mm',
         'browser/ui/cocoa/nsimage_cache_unittest.mm',
         'browser/ui/cocoa/nsmenuitem_additions_unittest.mm',
@@ -1590,8 +1588,10 @@
         'browser/ui/cocoa/view_resizer_pong.mm',
         'browser/ui/cocoa/web_drop_target_unittest.mm',
         'browser/ui/cocoa/window_size_autosaver_unittest.mm',
-        'browser/ui/cocoa/wrench_menu_button_cell_unittest.mm',
-        'browser/ui/cocoa/wrench_menu_controller_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm',
+        'browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm',
         'browser/ui/find_bar/find_backend_unittest.cc',
         'browser/ui/login/login_prompt_unittest.cc',
         'browser/ui/tabs/dock_info_unittest.cc',