Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4467)

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm

Issue 1417423003: chrome: Rename WrenchMenuModel to AppMenuModel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index 1a6ae6d72904a151d5d2cbeb2f8a1bf535d28577..bca4e52323055079be97aa135aff3a9b2b9b9578 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -18,9 +18,9 @@
#import "chrome/browser/ui/cocoa/view_resizer_pong.h"
#import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h"
#include "chrome/browser/ui/sync/browser_synced_window_delegates_getter.h"
+#include "chrome/browser/ui/toolbar/app_menu_model.h"
#include "chrome/browser/ui/toolbar/recent_tabs_builder_test_helper.h"
#include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
-#include "chrome/browser/ui/toolbar/wrench_menu_model.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/testing_profile.h"
@@ -37,10 +37,10 @@
namespace {
-class MockWrenchMenuModel : public WrenchMenuModel {
+class MockAppMenuModel : public AppMenuModel {
public:
- MockWrenchMenuModel() : WrenchMenuModel() {}
- ~MockWrenchMenuModel() {}
+ MockAppMenuModel() : AppMenuModel() {}
+ ~MockAppMenuModel() {}
MOCK_METHOD2(ExecuteCommand, void(int command_id, int event_flags));
};
@@ -70,7 +70,7 @@ class WrenchMenuControllerTest
ASSERT_TRUE(browser());
controller_.reset([[WrenchMenuController alloc] initWithBrowser:browser()]);
- fake_model_.reset(new MockWrenchMenuModel);
+ fake_model_.reset(new MockAppMenuModel);
manager_.reset(new browser_sync::SessionsSyncManager(
profile(),
@@ -109,7 +109,7 @@ class WrenchMenuControllerTest
base::scoped_nsobject<WrenchMenuController> controller_;
- scoped_ptr<MockWrenchMenuModel> fake_model_;
+ scoped_ptr<MockAppMenuModel> fake_model_;
private:
scoped_ptr<browser_sync::SessionsSyncManager> manager_;
« no previous file with comments | « chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/toolbar/app_menu_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698