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

chrome/browser/views/tabs/tab_strip.cc

 // 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.
 
 #include "chrome/browser/views/tabs/tab_strip.h"
 
 #include "app/drag_drop_types.h"
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
@@ skipping 726 matching lines @@
       needs_resize_layout_(false),
       current_unselected_width_(Tab::GetStandardSize().width()),
       current_selected_width_(Tab::GetStandardSize().width()),
       available_width_for_tabs_(-1) {
   Init();
 }
 
 TabStrip::~TabStrip() {
   active_animation_.reset(NULL);
 
-  model_->RemoveObserver(this);
+  // TODO(beng): (1031854) Restore this line once XPFrame/VistaFrame are dead.
+  // model_->RemoveObserver(this);
 
   // TODO(beng): remove this if it doesn't work to fix the TabSelectedAt bug.
   drag_controller_.reset(NULL);
 
   // Make sure we unhook ourselves as a message loop observer so that we don't
   // crash in the case where the user closes the window after closing a tab
   // but before moving the mouse.
   RemoveMessageLoopObserver();
 
   // The children (tabs) may callback to us from their destructor. Delete them
@@ skipping 52 matching lines @@
   }
   LoadNewTabButtonImage();
   newtab_button_->SetAccessibleName(l10n_util::GetString(IDS_ACCNAME_NEWTAB));
   AddChildView(newtab_button_);
 }
 
 bool TabStrip::IsCompatibleWith(TabStrip* other) const {
   return model_->profile() == other->model()->profile();
 }
 
-void TabStrip::InitFromModel() {
-  // Walk the model, calling our insertion observer method for each item within
-  // it.
-  for (int i = 0; i < model_->count(); ++i) {
-    TabInsertedAt(model_->GetTabContentsAt(i), i,
-                  i == model_->selected_index());
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // TabStrip, BaseTabStrip implementation:
 
 int TabStrip::GetPreferredHeight() {
   return GetPreferredSize().height();
 }
 
 void TabStrip::SetBackgroundOffset(const gfx::Point& offset) {
   int tab_count = GetTabCount();
   for (int i = 0; i < tab_count; ++i)
@@ skipping 471 matching lines @@
 }
 
 bool TabStrip::IsCommandEnabledForTab(
     TabStripModel::ContextMenuCommand command_id, const Tab* tab) const {
   int index = GetIndexOfTab(tab);
   if (model_->ContainsIndex(index))
     return model_->IsContextMenuCommandEnabled(index, command_id);
   return false;
 }
 
-bool TabStrip::IsCommandCheckedForTab(
-    TabStripModel::ContextMenuCommand command_id, const Tab* tab) const {
-  // TODO(beng): move to TabStripModel, see note in IsTabPinned.
-  if (command_id == TabStripModel::CommandTogglePinned)
-    return IsTabPinned(tab);
-
-  int index = GetIndexOfTab(tab);
-  if (model_->ContainsIndex(index))
-    return model_->IsContextMenuCommandChecked(index, command_id);
-  return false;
-}
-
 void TabStrip::ExecuteCommandForTab(
     TabStripModel::ContextMenuCommand command_id, Tab* tab) {
   int index = GetIndexOfTab(tab);
   if (model_->ContainsIndex(index))
     model_->ExecuteContextMenuCommand(index, command_id);
 }
 
 void TabStrip::StartHighlightTabsForCommand(
     TabStripModel::ContextMenuCommand command_id, Tab* tab) {
   if (command_id == TabStripModel::CommandCloseTabsOpenedBy) {
@@ skipping 728 matching lines @@
   }
 }
 
 bool TabStrip::HasPhantomTabs() const {
   for (int i = 0; i < GetTabCount(); ++i) {
     if (GetTabAt(i)->phantom())
       return true;
   }
   return false;
 }