summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/tabs/tab_strip.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/views/tabs/tab_strip.cc')
-rw-r--r--chrome/browser/views/tabs/tab_strip.cc20
1 files changed, 2 insertions, 18 deletions
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index a6e11d3..7f31722 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -265,7 +265,8 @@ TabStrip::~TabStrip() {
// delete the tabs.
StopAnimating(false);
- 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);
@@ -340,15 +341,6 @@ gfx::Rect TabStrip::GetNewTabButtonBounds() {
return newtab_button_->bounds();
}
-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:
@@ -874,14 +866,6 @@ bool TabStrip::IsCommandEnabledForTab(
return false;
}
-bool TabStrip::IsCommandCheckedForTab(
- TabStripModel::ContextMenuCommand command_id, const Tab* tab) const {
- int model_index = GetModelIndexOfTab(tab);
- if (model_->ContainsIndex(model_index))
- return model_->IsContextMenuCommandChecked(model_index, command_id);
- return false;
-}
-
void TabStrip::ExecuteCommandForTab(
TabStripModel::ContextMenuCommand command_id, Tab* tab) {
int model_index = GetModelIndexOfTab(tab);