Revert r42156, r42157, r42160. Allow dynamic switching in and out of sidetabs...

chrome/browser/views/frame/browser_view.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 133 matching lines @@
   // Accessor for the TabStrip.
   BaseTabStrip* tabstrip() const { return tabstrip_; }
 
   // Accessor for the ExtensionShelf.
   ExtensionShelf* extension_shelf() const { return extension_shelf_; }
 
   // Returns true if various window components are visible.
   bool IsTabStripVisible() const;
 
   // Returns true if the vertical tabstrip is in use.
-  bool UseVerticalTabs() const;
+  bool UsingSideTabs() const;
 
   // Returns true if the profile associated with this Browser window is
   // off the record.
   bool IsOffTheRecord() const;
 
   // Returns true if the non-client view should render the Off-The-Record
   // avatar icon if the window is off the record.
   bool ShouldShowOffTheRecordAvatar() const;
 
   // Handle the specified |accelerator| being pressed.
@@ skipping 150 matching lines @@
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
                                       bool* is_keyboard_shortcut);
   virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
   virtual void ShowCreateShortcutsDialog(TabContents* tab_contents);
 #if defined(OS_CHROMEOS)
   virtual void ToggleCompactNavigationBar();
 #endif  // defined(OS_CHROMEOS)
   virtual void Cut();
   virtual void Copy();
   virtual void Paste();
-  virtual void ToggleTabStripMode();
 
   // Overridden from BrowserWindowTesting:
   virtual BookmarkBarView* GetBookmarkBarView() const;
   virtual LocationBarView* GetLocationBarView() const;
   virtual views::View* GetTabContentsContainerView() const;
   virtual ToolbarView* GetToolbarView() const;
 
   // Overridden from NotificationObserver:
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ skipping 55 matching lines @@
   virtual void ChildPreferredSizeChanged(View* child);
   virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
   virtual bool GetAccessibleName(std::wstring* name);
   virtual void SetAccessibleName(const std::wstring& name);
 
   // Factory Methods.
   // Returns a new LayoutManager for this browser view. A subclass may
   // override to implemnet different layout pocily.
   virtual views::LayoutManager* CreateLayoutManager() const;
 
-  // Initializes a new TabStrip for the browser view. This can be performed
-  // multiple times over the life of the browser, and is run when the display
-  // mode for the tabstrip changes from horizontal to vertical.
-  void InitTabStrip(TabStripModel* tab_strip_model);
+  // Returns a new TabStrip for the browser view. A subclass may
+  // override to return a different TabStrip implementation.
+  virtual BaseTabStrip* CreateTabStrip(TabStripModel* tab_strip_model);
 
   // Browser window related initializations.
   virtual void Init();
 
  private:
   friend class BrowserViewLayout;
 
 #if defined(OS_WIN)
   // Creates the system menu.
   void InitSystemMenu();
@@ skipping 164 matching lines @@
 
   // Last focused view that issued a tab traversal.
   int last_focused_view_storage_id_;
 
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_