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

Unified Diff: chrome/browser/ui/cocoa/extensions/test_toolbar_actions_bar_helper_cocoa.mm

Issue 1104813005: [Extensions Toolbar] Refactor a few test classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/extensions/test_toolbar_actions_bar_helper_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/extensions/test_toolbar_actions_bar_helper_cocoa.mm b/chrome/browser/ui/cocoa/extensions/test_toolbar_actions_bar_helper_cocoa.mm
deleted file mode 100644
index aa3b39c76363e5927ea22acc11d91d2ca8ab19d7..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/extensions/test_toolbar_actions_bar_helper_cocoa.mm
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_helper.h"
-
-#import "base/mac/scoped_nsobject.h"
-#import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"
-#import "chrome/browser/ui/cocoa/extensions/browser_actions_controller.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
-
-namespace {
-
-// The Cocoa implementation of the TestToolbarActionsBarHelper, which creates
-// (and owns) a BrowserActionsController and BrowserActionsContainerView for
-// testing purposes.
-class TestToolbarActionsBarHelperCocoa : public TestToolbarActionsBarHelper {
- public:
- TestToolbarActionsBarHelperCocoa(Browser* browser,
- TestToolbarActionsBarHelperCocoa* mainBar);
- ~TestToolbarActionsBarHelperCocoa() override;
-
- private:
- // TestToolbarActionsBarHelper:
- ToolbarActionsBar* GetToolbarActionsBar() override;
-
- // The owned BrowserActionsContainerView and BrowserActionsController; the
- // mac implementation of the ToolbarActionsBar delegate and view.
- base::scoped_nsobject<BrowserActionsContainerView> containerView_;
- base::scoped_nsobject<BrowserActionsController> controller_;
-
- DISALLOW_COPY_AND_ASSIGN(TestToolbarActionsBarHelperCocoa);
-};
-
-TestToolbarActionsBarHelperCocoa::TestToolbarActionsBarHelperCocoa(
- Browser* browser,
- TestToolbarActionsBarHelperCocoa* mainBar) {
- // Make sure that Cocoa has been bootstrapped.
- CocoaTest::BootstrapCocoa();
-
- containerView_.reset([[BrowserActionsContainerView alloc]
- initWithFrame:NSMakeRect(0, 0, 0, 15)]);
- BrowserActionsController* mainController =
- mainBar ? mainBar->controller_.get() : nil;
- controller_.reset([[BrowserActionsController alloc]
- initWithBrowser:browser
- containerView:containerView_.get()
- mainController:mainController]);
-}
-
-TestToolbarActionsBarHelperCocoa::~TestToolbarActionsBarHelperCocoa() {}
-
-ToolbarActionsBar* TestToolbarActionsBarHelperCocoa::GetToolbarActionsBar() {
- return [controller_ toolbarActionsBar];
-}
-
-} // namespace
-
-scoped_ptr<TestToolbarActionsBarHelper> TestToolbarActionsBarHelper::Create(
- Browser* browser,
- TestToolbarActionsBarHelper* main_bar) {
- return make_scoped_ptr(new TestToolbarActionsBarHelperCocoa(
- browser,
- static_cast<TestToolbarActionsBarHelperCocoa*>(main_bar)));
-}

Powered by Google App Engine
This is Rietveld 408576698