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

Unified Diff: chrome/browser/ui/views/toolbar/test_toolbar_actions_bar_helper_views.cc

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
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/toolbar/test_toolbar_actions_bar_helper_views.cc
diff --git a/chrome/browser/ui/views/toolbar/test_toolbar_actions_bar_helper_views.cc b/chrome/browser/ui/views/toolbar/test_toolbar_actions_bar_helper_views.cc
deleted file mode 100644
index 0e8b71b4b4f36243118ea251af66e37666da1b0a..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/toolbar/test_toolbar_actions_bar_helper_views.cc
+++ /dev/null
@@ -1,62 +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"
-
-#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
-#include "ui/views/view.h"
-
-namespace {
-
-// The views-specific implementation of the TestToolbarActionsBarHelper, which
-// creates and owns a BrowserActionsContainer.
-class TestToolbarActionsBarHelperViews : public TestToolbarActionsBarHelper {
- public:
- TestToolbarActionsBarHelperViews(Browser* browser,
- TestToolbarActionsBarHelperViews* main_bar);
- ~TestToolbarActionsBarHelperViews() override;
-
- private:
- // TestToolbarActionsBarHelper:
- ToolbarActionsBar* GetToolbarActionsBar() override;
-
- // The parent of the BrowserActionsContainer, which directly owns the
- // container as part of the views hierarchy.
- views::View container_parent_;
-
- // The created BrowserActionsContainer. Owned by |container_parent_|.
- BrowserActionsContainer* browser_actions_container_;
-
- DISALLOW_COPY_AND_ASSIGN(TestToolbarActionsBarHelperViews);
-};
-
-TestToolbarActionsBarHelperViews::TestToolbarActionsBarHelperViews(
- Browser* browser,
- TestToolbarActionsBarHelperViews* main_bar)
- : browser_actions_container_(
- new BrowserActionsContainer(
- browser,
- main_bar ? main_bar->browser_actions_container_ : nullptr)) {
- // The BrowserActionsContainer expects to have a parent (and be added to the
- // view hierarchy), so wrap it in a shell view.
- container_parent_.set_owned_by_client();
- container_parent_.AddChildView(browser_actions_container_);
-}
-
-TestToolbarActionsBarHelperViews::~TestToolbarActionsBarHelperViews() {}
-
-ToolbarActionsBar* TestToolbarActionsBarHelperViews::GetToolbarActionsBar() {
- return browser_actions_container_->toolbar_actions_bar();
-}
-
-} // namespace
-
-// static
-scoped_ptr<TestToolbarActionsBarHelper>
-TestToolbarActionsBarHelper::Create(Browser* browser,
- TestToolbarActionsBarHelper* main_bar) {
- return make_scoped_ptr(new TestToolbarActionsBarHelperViews(
- browser,
- static_cast<TestToolbarActionsBarHelperViews*>(main_bar)));
-}
« no previous file with comments | « chrome/browser/ui/views/toolbar/browser_action_test_util_views.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698