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

chrome/browser/views/tabs/tab_strip.h

 // Copyright (c) 2006-2008 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_TABS_TAB_STRIP_H_
 #define CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_
 
 #include "base/message_loop.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/views/tabs/base_tab_strip.h"
@@ skipping 56 matching lines @@
   // Returns the currently selected tab.
   Tab* GetSelectedTab() const;
 
   // Create the new tab button.
   void InitTabStripButtons();
 
   // Return true if this tab strip is compatible with the provided tab strip.
   // Compatible tab strips can transfer tabs during drag and drop.
   bool IsCompatibleWith(TabStrip* other) const;
 
-  // Populates the BaseTabStrip implementation from its model. This is primarily
-  // useful when switching between display types and there are existing tabs.
-  // Upon initial creation the TabStrip is empty.
-  void InitFromModel();
-
   // BaseTabStrip implementation:
   virtual int GetPreferredHeight();
   virtual void SetBackgroundOffset(const gfx::Point& offset);
   virtual bool IsPositionInWindowCaption(const gfx::Point& point);
   virtual void SetDraggedTabBounds(int tab_index,
                                    const gfx::Rect& tab_bounds);
   virtual bool IsDragSessionActive() const;
   virtual void UpdateLoadingAnimations();
   virtual bool IsAnimating() const;
   virtual TabStrip* AsTabStrip();
@@ skipping 42 matching lines @@
   virtual void TabMiniStateChanged(TabContents* contents, int index);
   virtual void TabBlockedStateChanged(TabContents* contents, int index);
 
   // Tab::Delegate implementation:
   virtual bool IsTabSelected(const Tab* tab) const;
   virtual bool IsTabPinned(const Tab* tab) const;
   virtual void SelectTab(Tab* tab);
   virtual void CloseTab(Tab* tab);
   virtual bool IsCommandEnabledForTab(
       TabStripModel::ContextMenuCommand command_id, const Tab* tab) const;
-  virtual bool IsCommandCheckedForTab(
-      TabStripModel::ContextMenuCommand command_id, const Tab* tab) const;
   virtual void ExecuteCommandForTab(
       TabStripModel::ContextMenuCommand command_id, Tab* tab);
   virtual void StartHighlightTabsForCommand(
       TabStripModel::ContextMenuCommand command_id, Tab* tab);
   virtual void StopHighlightTabsForCommand(
       TabStripModel::ContextMenuCommand command_id, Tab* tab);
   virtual void StopAllHighlighting();
   virtual void MaybeStartDrag(Tab* tab, const views::MouseEvent& event);
   virtual void ContinueDrag(const views::MouseEvent& event);
   virtual bool EndDrag(bool canceled);
@@ skipping 254 matching lines @@
   };
   std::vector<TabData> tab_data_;
 
   // The currently running animation.
   scoped_ptr<TabAnimation> active_animation_;
 
   DISALLOW_COPY_AND_ASSIGN(TabStrip);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_H_