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

chrome/browser/sidebar/sidebar_browsertest.cc

Index: chrome/browser/sidebar/sidebar_browsertest.cc
===================================================================
--- chrome/browser/sidebar/sidebar_browsertest.cc	(revision 74134)
+++ chrome/browser/sidebar/sidebar_browsertest.cc	(working copy)
@@ -11,6 +11,7 @@
 #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"
@@ -50,25 +51,25 @@
   }
 
   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();
 
@@ -81,34 +82,34 @@
     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 {
@@ -166,7 +167,7 @@
   browser()->NewTab();
 
   // Hide sidebar on inactive (first) tab.
-  HideSidebar(tab_contents(0));
+  HideSidebar(tab(0));
 
   // Switch back to the first tab.
   browser()->SelectNumberedTab(0);
@@ -175,8 +176,8 @@
   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());