Sidebar mini tabs UI (views version)....

chrome/browser/sidebar/sidebar_browsertest.cc

 // Copyright (c) 2011 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/file_path.h"
 #include "base/path_service.h"
 #include "base/ref_counted.h"
 #include "chrome/browser/browser_window.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/test/test_server.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 19 matching lines @@
     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()->GetSelectedTabContents());
+    ShowSidebar(browser()->GetSelectedTabContentsWrapper());
   }
 
   void ExpandSidebarForCurrentTab() {
-    ExpandSidebar(browser()->GetSelectedTabContents());
+    ExpandSidebar(browser()->GetSelectedTabContentsWrapper());
   }
 
   void CollapseSidebarForCurrentTab() {
-    CollapseSidebar(browser()->GetSelectedTabContents());
+    CollapseSidebar(browser()->GetSelectedTabContentsWrapper());
   }
 
   void HideSidebarForCurrentTab() {
-    HideSidebar(browser()->GetSelectedTabContents());
+    HideSidebar(browser()->GetSelectedTabContentsWrapper());
   }
 
   void NavigateSidebarForCurrentTabTo(const std::string& test_page) {
     GURL url = test_server()->GetURL(test_page);
 
-    TabContents* tab = browser()->GetSelectedTabContents();
+    TabContentsWrapper* tab = browser()->GetSelectedTabContentsWrapper();
 
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
 
     sidebar_manager->NavigateSidebar(tab, content_id_, url);
 
     SidebarContainer* sidebar_container =
         sidebar_manager->GetSidebarContainerFor(tab, content_id_);
 
     TabContents* client_contents = sidebar_container->sidebar_contents();
     ui_test_utils::WaitForNavigation(&client_contents->controller());
   }
 
-  void ShowSidebar(TabContents* tab) {
+  void ShowSidebar(TabContentsWrapper* tab) {
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
     sidebar_manager->ShowSidebar(tab, content_id_);
   }
 
-  void ExpandSidebar(TabContents* tab) {
+  void ExpandSidebar(TabContentsWrapper* tab) {
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
     sidebar_manager->ExpandSidebar(tab, content_id_);
-    if (browser()->GetSelectedTabContents() == tab)
+    if (browser()->GetSelectedTabContentsWrapper() == tab)
       EXPECT_GT(browser_view()->GetSidebarWidth(), 0);
   }
 
-  void CollapseSidebar(TabContents* tab) {
+  void CollapseSidebar(TabContentsWrapper* tab) {
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
     sidebar_manager->CollapseSidebar(tab, content_id_);
-    if (browser()->GetSelectedTabContents() == tab)
+    if (browser()->GetSelectedTabContentsWrapper() == tab)
       EXPECT_EQ(0, browser_view()->GetSidebarWidth());
   }
 
-  void HideSidebar(TabContents* tab) {
+  void HideSidebar(TabContentsWrapper* tab) {
     SidebarManager* sidebar_manager = SidebarManager::GetInstance();
     sidebar_manager->HideSidebar(tab, content_id_);
-    if (browser()->GetSelectedTabContents() == tab)
+    if (browser()->GetSelectedTabContentsWrapper() == tab)
       EXPECT_EQ(0, browser_view()->GetSidebarWidth());
   }
 
-  TabContents* tab_contents(int i) {
-    return browser()->GetTabContentsAt(i);
+  TabContentsWrapper* tab(int i) {
+    return browser()->GetTabContentsWrapperAt(i);
   }
 
   BrowserView* browser_view() const {
     return static_cast<BrowserView*>(browser()->window());
   }
 
  private:
   std::string content_id_;
 };
 
@@ skipping 37 matching lines @@
   HideSidebarForCurrentTab();
 }
 
 IN_PROC_BROWSER_TEST_F(SidebarTest, SidebarOnInactiveTab) {
   ShowSidebarForCurrentTab();
   ExpandSidebarForCurrentTab();
 
   browser()->NewTab();
 
   // Hide sidebar on inactive (first) tab.
-  HideSidebar(tab_contents(0));
+  HideSidebar(tab(0));
 
   // Switch back to the first tab.
   browser()->SelectNumberedTab(0);
 
   // Make sure sidebar is not visbile anymore.
   EXPECT_EQ(0, browser_view()->GetSidebarWidth());
 
   // Show sidebar on inactive (second) tab.
-  ShowSidebar(tab_contents(1));
-  ExpandSidebar(tab_contents(1));
+  ShowSidebar(tab(1));
+  ExpandSidebar(tab(1));
   // Make sure sidebar is not visible yet.
   EXPECT_EQ(0, browser_view()->GetSidebarWidth());
 
   // Switch back to the second tab.
   browser()->SelectNumberedTab(1);
   // 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(kSimplePage);
 
   HideSidebarForCurrentTab();
 }
 
 }  // namespace