Attemp 2 at:

chrome/browser/views/tabs/browser_tab_strip_controller.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/browser_tab_strip_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/profile.h"
@@ skipping 18 matching lines @@
     return TabRendererData::NETWORK_STATE_WAITING;
   return TabRendererData::NETWORK_STATE_LOADING;
 }
 
 class BrowserTabStripController::TabContextMenuContents
     : public menus::SimpleMenuModel::Delegate {
  public:
   TabContextMenuContents(BaseTab* tab,
                          BrowserTabStripController* controller)
       : ALLOW_THIS_IN_INITIALIZER_LIST(
-          model_(this, controller->IsTabPinned(tab), controller->IsAppTab(tab),
-                 controller->IsToolbarVisible(tab))),
+          model_(this, controller->IsTabPinned(tab))),
         tab_(tab),
         controller_(controller),
         last_command_(TabStripModel::CommandFirst) {
     Build();
   }
   virtual ~TabContextMenuContents() {
     menu_->CancelMenu();
     if (controller_)
       controller_->tabstrip_->StopAllHighlighting();
   }
@@ skipping 113 matching lines @@
     BaseTab* tab) {
   int model_index = tabstrip_->GetModelIndexOfBaseTab(tab);
   if (model_->ContainsIndex(model_index))
     model_->ExecuteContextMenuCommand(model_index, command_id);
 }
 
 bool BrowserTabStripController::IsTabPinned(BaseTab* tab) {
   return IsTabPinned(tabstrip_->GetModelIndexOfBaseTab(tab));
 }
 
-bool BrowserTabStripController::IsAppTab(BaseTab* tab) {
-  int index = tabstrip_->GetModelIndexOfBaseTab(tab);
-  if (!model_->ContainsIndex(index))
-    return false;
-
-  return model_->IsAppTab(index);
-}
-
-bool BrowserTabStripController::IsToolbarVisible(BaseTab* tab) {
-  int index = tabstrip_->GetModelIndexOfBaseTab(tab);
-  if (!model_->ContainsIndex(index))
-    return false;
-
-  return model_->IsToolbarVisible(index);
-}
-
 int BrowserTabStripController::GetCount() const {
   return model_->count();
 }
 
 bool BrowserTabStripController::IsValidIndex(int index) const {
   return model_->ContainsIndex(index);
 }
 
 int BrowserTabStripController::GetSelectedIndex() const {
   return model_->selected_index();
@@ skipping 237 matching lines @@
   DCHECK(type.value == NotificationType::TAB_CLOSEABLE_STATE_CHANGED);
   // Note that this notification may be fired during a model mutation and
   // possibly before the tabstrip has processed the change.
   // Here, we just re-layout each existing tab to reflect the change in its
   // closeable state, and then schedule paint for entire tabstrip.
   for (int i = 0; i < tabstrip_->tab_count(); ++i) {
     tabstrip_->base_tab_at_tab_index(i)->Layout();
   }
   tabstrip_->SchedulePaint();
 }