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

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

Issue 661493004: Add infrastructure for Chrome Actions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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/views/toolbar/component_toolbar_actions_browsertest.cc
diff --git a/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc b/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..131f5c5679f19ee43b757b0a0713a04a122a073c
--- /dev/null
+++ b/chrome/browser/ui/views/toolbar/component_toolbar_actions_browsertest.cc
@@ -0,0 +1,142 @@
+// 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 "base/macros.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar/browser_action_view.h"
+#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "extensions/common/feature_switch.h"
+#include "grit/theme_resources.h"
+#include "ui/base/resource/resource_bundle.h"
+
+namespace {
+
+const char kMockId[] = "mock_action";
+
+class MockComponentAction : public ToolbarActionViewController {
+ public:
+ MockComponentAction() : click_count_(0u), id_(kMockId) {}
+ virtual ~MockComponentAction() {}
+
+ // ToolbarActionButtonController:
+ virtual const std::string& GetId() const override { return id_; }
+ virtual void SetDelegate(ToolbarActionViewDelegate* delegate) override {}
+ virtual gfx::Image GetIcon(content::WebContents* web_contents) override {
+ return ui::ResourceBundle::GetSharedInstance().GetImageNamed(
+ IDR_BROWSER_ACTION);
+ }
+ virtual gfx::ImageSkia GetIconWithBadge() override {
+ return *GetIcon(nullptr).ToImageSkia();
+ }
+ virtual base::string16 GetAccessibleName(content::WebContents* web_contents)
+ const override {
+ return base::ASCIIToUTF16("Component Action");
+ }
+ virtual base::string16 GetTooltip(content::WebContents* web_contents)
+ const override {
+ return GetAccessibleName(web_contents);
+ }
+ virtual bool IsEnabled(content::WebContents* web_contents) const override {
+ return true;
+ }
+ virtual bool HasPopup(content::WebContents* web_contents) const override {
+ return true;
+ }
+ virtual void HidePopup() override {}
+ virtual gfx::NativeView GetPopupNativeView() override { return nullptr; }
+ virtual bool CanDrag() const override { return false; }
+ virtual bool IsMenuRunning() const override { return false; }
+ virtual bool ExecuteAction(bool by_user) override {
+ ++click_count_;
+ return false;
+ }
+
+ size_t click_count() const { return click_count_; }
+
+ private:
+ size_t click_count_;
+ std::string id_;
+
+ DISALLOW_COPY_AND_ASSIGN(MockComponentAction);
+};
+
+class MockComponentToolbarActionsFactory
+ : public ComponentToolbarActionsFactory {
+ public:
+ MockComponentToolbarActionsFactory();
+ virtual ~MockComponentToolbarActionsFactory();
+
+ // ComponentToolbarActionsFactory:
+ virtual ScopedVector<ToolbarActionViewController>
+ GetComponentToolbarActions() override;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(MockComponentToolbarActionsFactory);
+};
+
+MockComponentToolbarActionsFactory::MockComponentToolbarActionsFactory() {
+ ComponentToolbarActionsFactory::SetTestingFactory(this);
+}
+
+MockComponentToolbarActionsFactory::~MockComponentToolbarActionsFactory() {
+ ComponentToolbarActionsFactory::SetTestingFactory(nullptr);
+}
+
+ScopedVector<ToolbarActionViewController>
+MockComponentToolbarActionsFactory::GetComponentToolbarActions() {
+ ScopedVector<ToolbarActionViewController> component_actions;
+ component_actions.push_back(new MockComponentAction());
+ return component_actions.Pass();
+}
+
+} // namespace
+
+class ComponentToolbarActionsBrowserTest : public InProcessBrowserTest {
+ protected:
+ ComponentToolbarActionsBrowserTest() {}
+ virtual ~ComponentToolbarActionsBrowserTest() {}
+
+ virtual void SetUpCommandLine(base::CommandLine* command_line) override {
+ InProcessBrowserTest::SetUpCommandLine(command_line);
+ enable_redesign_.reset(new extensions::FeatureSwitch::ScopedOverride(
+ extensions::FeatureSwitch::extension_action_redesign(), true));
+ mock_actions_factory_.reset(new MockComponentToolbarActionsFactory());
+ }
+
+ private:
+ scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
+ scoped_ptr<MockComponentToolbarActionsFactory> mock_actions_factory_;
+
+ DISALLOW_COPY_AND_ASSIGN(ComponentToolbarActionsBrowserTest);
+};
+
+// Test that Component Toolbar Actions appear in the browser actions container
+// and can receive click events properly.
+IN_PROC_BROWSER_TEST_F(ComponentToolbarActionsBrowserTest,
+ ComponentToolbarActionsShowUpAndRespondToClicks) {
+ BrowserActionsContainer* browser_actions_container =
+ BrowserView::GetBrowserViewForBrowser(browser())
+ ->toolbar()->browser_actions();
+
+ // There should be only one component action view.
+ ASSERT_EQ(1u, browser_actions_container->num_browser_actions());
+
+ BrowserActionView* view =
+ browser_actions_container->GetBrowserActionViewAt(0u);
+ ASSERT_EQ(kMockId, view->view_controller()->GetId());
+ MockComponentAction* mock_component_action =
+ static_cast<MockComponentAction*>(view->view_controller());
+
+ // Test that clicking on the component action works.
+ EXPECT_EQ(0u, mock_component_action->click_count());
+ view->Activate();
+ EXPECT_EQ(1u, mock_component_action->click_count());
+}
« no previous file with comments | « chrome/browser/ui/views/toolbar/chevron_menu_button.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_action_view_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698