Attemp 2 at:

chrome/browser/tabs/tab_strip_model.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/tabs/tab_strip_model.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/stl_util-inl.h"
@@ skipping 103 matching lines @@
       profile_(profile),
       closing_all_(false),
       order_controller_(NULL) {
   DCHECK(delegate_);
   registrar_.Add(this,
                  NotificationType::TAB_CONTENTS_DESTROYED,
                  NotificationService::AllSources());
   registrar_.Add(this,
                  NotificationType::EXTENSION_UNLOADED,
                  Source<Profile>(profile_));
-  registrar_.Add(this,
-                 NotificationType::EXTENSION_APP_TOOLBAR_VISIBILITY_CHANGED,
-                 NotificationService::AllSources());
   order_controller_ = new TabStripModelOrderController(this);
 }
 
 TabStripModel::~TabStripModel() {
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                     TabStripModelDeleted());
 
   // Before deleting any phantom tabs remove our notification observers so that
   // we don't attempt to notify our delegate or do any processing.
   registrar_.RemoveAll();
@@ skipping 384 matching lines @@
 
 bool TabStripModel::IsMiniTab(int index) const {
   return IsTabPinned(index) || IsAppTab(index);
 }
 
 bool TabStripModel::IsAppTab(int index) const {
   TabContents* contents = GetTabContentsAt(index);
   return contents && contents->is_app();
 }
 
-bool TabStripModel::IsToolbarVisible(int index) const {
-  Extension* extension_app = GetTabContentsAt(index)->extension_app();
-  if (!extension_app)
-    return true;
-
-  ExtensionsService* service = profile()->GetExtensionsService();
-  ExtensionPrefs* prefs = service->extension_prefs();
-  return prefs->AreAppTabToolbarsVisible(extension_app->id());
-}
-
 bool TabStripModel::IsPhantomTab(int index) const {
   return IsTabPinned(index) &&
          GetTabContentsAt(index)->controller().needs_reload();
 }
 
 bool TabStripModel::IsTabBlocked(int index) const {
   return contents_data_[index]->blocked;
 }
 
 int TabStripModel::IndexOfFirstNonMiniTab() const {
@@ skipping 150 matching lines @@
     case CommandCloseTabsToRight:
       // Close doesn't effect mini-tabs.
       return count() != IndexOfFirstNonMiniTab() &&
           context_index < (count() - 1);
     case CommandDuplicate:
       return delegate_->CanDuplicateContentsAt(context_index);
     case CommandRestoreTab:
       return delegate_->CanRestoreTab();
     case CommandTogglePinned:
       return true;
-    case CommandToggleToolbar:
-      return true;
     case CommandBookmarkAllTabs:
       return delegate_->CanBookmarkAllTabs();
     case CommandUseVerticalTabs:
       return true;
     default:
       NOTREACHED();
   }
   return false;
 }
 
@@ skipping 65 matching lines @@
       if (IsPhantomTab(context_index)) {
         // The tab is a phantom tab, close it.
         CloseTabContentsAt(context_index,
                            CLOSE_USER_GESTURE | CLOSE_CREATE_HISTORICAL_TAB);
       } else {
         SelectTabContentsAt(context_index, true);
         SetTabPinned(context_index, !IsTabPinned(context_index));
       }
       break;
     }
-    case CommandToggleToolbar: {
-      UserMetrics::RecordAction(
-          UserMetricsAction("TabContextMenu_ToggleToolbar"),
-          profile_);
-
-      SelectTabContentsAt(context_index, true);
-
-      Extension* extension_app =
-          GetTabContentsAt(context_index)->extension_app();
-      if (!extension_app)
-        break;
-
-      ExtensionsService* service = profile()->GetExtensionsService();
-      ExtensionPrefs* prefs = service->extension_prefs();
-      bool new_val = !prefs->AreAppTabToolbarsVisible(extension_app->id());
-      prefs->SetAppTabToolbarVisibility(extension_app->id(), new_val);
-
-      // There might be multiple browsers displaying this app, so we send a
-      // notification to update them all.
-      NotificationService::current()->Notify(
-          NotificationType::EXTENSION_APP_TOOLBAR_VISIBILITY_CHANGED,
-          Source<Extension>(extension_app),
-          Details<bool>(&new_val));
-
-      break;
-    }
 
     case CommandBookmarkAllTabs: {
       UserMetrics::RecordAction(
           UserMetricsAction("TabContextMenu_BookmarkAllTabs"),
           profile_);
 
       delegate_->BookmarkAllTabs();
       break;
     }
 
@@ skipping 66 matching lines @@
           // the TabContents. Deleting a TabContents results in a notification
           // of type TAB_CONTENTS_DESTROYED; we do the necessary cleanup in
           // handling that notification.
 
           InternalCloseTab(contents, i, false);
         }
       }
       break;
     }
 
-    case NotificationType::EXTENSION_APP_TOOLBAR_VISIBILITY_CHANGED: {
-      Extension* extension = Source<Extension>(source).ptr();
-      bool* value = Details<bool>(details).ptr();
-      TabContents* selected = GetSelectedTabContents();
-
-      if (selected && selected->extension_app() == extension)
-        delegate_->SetToolbarVisibility(*value);
-
-      break;
-    }
-
     default:
       NOTREACHED();
   }
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabStripModel, private:
 
 bool TabStripModel::IsNewTabAtEndOfTabStrip(TabContents* contents) const {
   return LowerCaseEqualsASCII(contents->GetURL().spec(),
@@ skipping 211 matching lines @@
   FOR_EACH_OBSERVER(TabStripModelObserver, observers_,
                     TabMoved(moved_data->contents, index, to_position));
 }
 
 // static
 bool TabStripModel::OpenerMatches(const TabContentsData* data,
                                   const NavigationController* opener,
                                   bool use_group) {
   return data->opener == opener || (use_group && data->group == opener);
 }