[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
diff --git a/chrome/browser/ui/cocoa/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar_controller.mm
index 92afce8..0596d21b 100644
--- a/chrome/browser/ui/cocoa/toolbar_controller.mm
+++ b/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"
diff --git a/chrome/browser/ui/cocoa/menu_tracked_button.h b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h
similarity index 88%
rename from chrome/browser/ui/cocoa/menu_tracked_button.h
rename to chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.h
index 3ac9bd0..5a46342 100644
--- a/chrome/browser/ui/cocoa/menu_tracked_button.h
+++ b/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_
diff --git a/chrome/browser/ui/cocoa/menu_tracked_button.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm
similarity index 97%
rename from chrome/browser/ui/cocoa/menu_tracked_button.mm
rename to chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button.mm
index 37a79bb8..3f65b36 100644
--- a/chrome/browser/ui/cocoa/menu_tracked_button.mm
+++ b/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>
diff --git a/chrome/browser/ui/cocoa/menu_tracked_button_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm
similarity index 98%
rename from chrome/browser/ui/cocoa/menu_tracked_button_unittest.mm
rename to chrome/browser/ui/cocoa/wrench_menu/menu_tracked_button_unittest.mm
index 9b6f77a7..16a529a 100644
--- a/chrome/browser/ui/cocoa/menu_tracked_button_unittest.mm
+++ b/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"
diff --git a/chrome/browser/ui/cocoa/menu_tracked_root_view.h b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h
similarity index 77%
rename from chrome/browser/ui/cocoa/menu_tracked_root_view.h
rename to chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h
index c4757839..7a5ab4c1 100644
--- a/chrome/browser/ui/cocoa/menu_tracked_root_view.h
+++ b/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_
diff --git a/chrome/browser/ui/cocoa/menu_tracked_root_view.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm
similarity index 81%
rename from chrome/browser/ui/cocoa/menu_tracked_root_view.mm
rename to chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm
index 29dd93d23..96b3b26 100644
--- a/chrome/browser/ui/cocoa/menu_tracked_root_view.mm
+++ b/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
diff --git a/chrome/browser/ui/cocoa/menu_tracked_root_view_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm
similarity index 95%
rename from chrome/browser/ui/cocoa/menu_tracked_root_view_unittest.mm
rename to chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view_unittest.mm
index cb3eab12..a853824 100644
--- a/chrome/browser/ui/cocoa/menu_tracked_root_view_unittest.mm
+++ b/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"
diff --git a/chrome/browser/ui/cocoa/wrench_menu_button_cell.h b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h
similarity index 70%
rename from chrome/browser/ui/cocoa/wrench_menu_button_cell.h
rename to chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h
index c2d3432..4c400591 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_button_cell.h
+++ b/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_
diff --git a/chrome/browser/ui/cocoa/wrench_menu_button_cell.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm
similarity index 95%
rename from chrome/browser/ui/cocoa/wrench_menu_button_cell.mm
rename to chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm
index c2a15b75..d042989 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_button_cell.mm
+++ b/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"
diff --git a/chrome/browser/ui/cocoa/wrench_menu_button_cell_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm
similarity index 94%
rename from chrome/browser/ui/cocoa/wrench_menu_button_cell_unittest.mm
rename to chrome/browser/ui/cocoa/wrench_menu/wrench_menu_button_cell_unittest.mm
index 7ab15883..fc9e403 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_button_cell_unittest.mm
+++ b/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"
diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller.h b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h
similarity index 92%
rename from chrome/browser/ui/cocoa/wrench_menu_controller.h
rename to chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h
index f2dea7a..ec68120 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_controller.h
+++ b/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 @@
- (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_
diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
similarity index 97%
rename from chrome/browser/ui/cocoa/wrench_menu_controller.mm
rename to chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
index fdedecdd..7720154 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_controller.mm
+++ b/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"
diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
similarity index 97%
rename from chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm
rename to chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index 42be8654..d3832aa 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_controller_unittest.mm
+++ b/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"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1b3bde1..4178b26 100644
--- a/chrome/chrome_browser.gypi
+++ b/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',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 931e3a7..a65635c 100644
--- a/chrome/chrome_tests.gypi
+++ b/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',
