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

Unified Diff: chrome/browser/ui/views/sidebar/sidebar_browsertest.cc

Issue 1152613003: Implement sidebar support for extension action popups (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Move SidebarManager to ExtensionSystem and remove notifications Created 5 years, 7 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/sidebar/sidebar_browsertest.cc
diff --git a/chrome/browser/ui/views/sidebar/sidebar_browsertest.cc b/chrome/browser/ui/views/sidebar/sidebar_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..cd4fb5aaa7ca0a51d161d656d2b855d6e319aa2d
--- /dev/null
+++ b/chrome/browser/ui/views/sidebar/sidebar_browsertest.cc
@@ -0,0 +1,187 @@
+// Copyright (c) 2015 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/command_line.h"
+#include "base/files/file_path.h"
+#include "base/memory/ref_counted.h"
+#include "base/path_service.h"
+#include "chrome/browser/extensions/extension_browsertest.h"
+#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/sidebar_manager.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/web_contents.h"
+#include "extensions/common/extension.h"
+
+using content::NavigationController;
+using content::WebContents;
+using extensions::SidebarManager;
+
+namespace {
+
+const char kSimplePage[] = "/simple_page.html";
+
+class SidebarTest : public ExtensionBrowserTest {
+ public:
+ SidebarTest() {}
+
+ protected:
+ // InProcessBrowserTest overrides.
+ void SetUpOnMainThread() override {
+ ExtensionBrowserTest::SetUpOnMainThread();
+
+ // Load test sidebar extension.
+ base::FilePath extension_path;
+ ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &extension_path));
+ extension_path = extension_path.AppendASCII("sidebar");
+
+ ASSERT_TRUE(LoadExtension(extension_path));
+
+ // For now content_id == extension_id.
+ content_id_ = last_loaded_extension_id();
+ }
+
+ void ShowSidebarForCurrentTab() {
+ ShowSidebar(browser()->tab_strip_model()->GetActiveWebContents());
+ }
+
+ void HideSidebarForCurrentTab() {
+ HideSidebar(browser()->tab_strip_model()->GetActiveWebContents());
+ }
+
+ void NavigateSidebarForCurrentTabTo() {
+ GURL url("chrome-extension://" + content_id_ + kSimplePage);
+
+ WebContents* tab = static_cast<WebContents*>(
+ browser()->tab_strip_model()->GetActiveWebContents());
+
+ SidebarManager* sidebar_manager =
+ SidebarManager::GetFromContext(browser()->profile());
+
+ SidebarContainer* sidebar_container =
+ sidebar_manager->GetSidebarContainerFor(tab, content_id_);
+ WebContents* client_contents = sidebar_container->host_contents();
+
+ content::WindowedNotificationObserver observer(
+ content::NOTIFICATION_LOAD_STOP,
+ content::Source<NavigationController>(
+ &client_contents->GetController()));
+ sidebar_manager->NavigateSidebar(tab, content_id_, url);
+ observer.Wait();
+ }
+
+ void ShowSidebar(WebContents* temp) {
+ WebContents* tab = static_cast<WebContents*>(temp);
+
+ SidebarManager* sidebar_manager =
+ SidebarManager::GetFromContext(browser()->profile());
+ GURL url("chrome-extension://" + content_id_ + kSimplePage);
+ sidebar_manager->ShowSidebar(tab, content_id_, url, browser());
+ }
+
+ void HideSidebar(WebContents* temp) {
+ WebContents* tab = static_cast<WebContents*>(temp);
+ SidebarManager* sidebar_manager =
+ SidebarManager::GetFromContext(browser()->profile());
+ sidebar_manager->HideSidebar(tab, content_id_);
+ if (browser()->tab_strip_model()->GetActiveWebContents() == tab)
+ EXPECT_EQ(0, browser_view()->GetSidebarWidth());
+ }
+ // Opens a new tab and waits for navigations to finish. If there are pending
+ // navigations, the constrained prompt might be dismissed when the navigation
+ // completes.
+ void OpenNewTab() {
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(), GURL("about:blank"), NEW_FOREGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
+ ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+ }
+
+ WebContents* web_contents(int i) {
+ return static_cast<WebContents*>(
+ browser()->tab_strip_model()->GetWebContentsAt(i));
+ }
+
+ BrowserView* browser_view() const {
+ return BrowserView::GetBrowserViewForBrowser(browser());
+ }
+
+ private:
+ std::string content_id_;
+};
+
+IN_PROC_BROWSER_TEST_F(SidebarTest, OpenClose) {
+ ShowSidebarForCurrentTab();
+
+ HideSidebarForCurrentTab();
+
+ ShowSidebarForCurrentTab();
+
+ HideSidebarForCurrentTab();
+}
+
+IN_PROC_BROWSER_TEST_F(SidebarTest, SwitchingTabs) {
+ ShowSidebarForCurrentTab();
+
+ OpenNewTab();
+
+ // Make sure sidebar is not visbile for the newly opened tab.
+ EXPECT_EQ(0, browser_view()->GetSidebarWidth());
+
+ // Switch back to the first tab.
+ TabStripModel* tab_strip_model = browser()->tab_strip_model();
+ tab_strip_model->ActivateTabAt(0, false);
+
+ // Make sure it is visible now.
+ EXPECT_GT(browser_view()->GetSidebarWidth(), 0);
+
+ HideSidebarForCurrentTab();
+}
+
+IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarOnInactiveTab) {
+ ShowSidebarForCurrentTab();
+
+ OpenNewTab();
+
+ // Hide sidebar on inactive (first) tab.
+ HideSidebar(web_contents(0));
+
+ // Switch back to the first tab.
+ TabStripModel* tab_strip_model = browser()->tab_strip_model();
+ tab_strip_model->ActivateTabAt(0, false);
+
+ // Make sure sidebar is not visbile anymore.
+ EXPECT_EQ(0, browser_view()->GetSidebarWidth());
+
+ // Show sidebar on inactive (second) tab.
+ ShowSidebar(web_contents(1));
+ // Make sure sidebar is not visible yet.
+ EXPECT_EQ(0, browser_view()->GetSidebarWidth());
+
+ // Switch back to the second tab.
+ tab_strip_model->ActivateTabAt(1, false);
+ // Make sure sidebar is visible now.
+ EXPECT_GT(browser_view()->GetSidebarWidth(), 0);
+
+ HideSidebarForCurrentTab();
+}
+
+IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarNavigate) {
+ ASSERT_TRUE(test_server()->Start());
+
+ ShowSidebarForCurrentTab();
+
+ NavigateSidebarForCurrentTabTo();
+
+ HideSidebarForCurrentTab();
+}
+
+} // namespace

Powered by Google App Engine
This is Rietveld 408576698