Revert 54560 - ...

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 94 matching lines @@
   // The last command that was selected, so that we can start/stop highlighting
   // appropriately as the user moves through the menu.
   TabStripModel::ContextMenuCommand last_command_;
 
   DISALLOW_COPY_AND_ASSIGN(TabContextMenuContents);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, public:
 
-BrowserTabStripController::BrowserTabStripController(Browser* browser,
-                                                     TabStripModel* model)
+BrowserTabStripController::BrowserTabStripController(TabStripModel* model)
     : model_(model),
-      tabstrip_(NULL),
-      browser_(browser) {
+      tabstrip_(NULL) {
   model_->AddObserver(this);
 
   notification_registrar_.Add(this,
       NotificationType::TAB_CLOSEABLE_STATE_CHANGED,
       NotificationService::AllSources());
 }
 
 BrowserTabStripController::~BrowserTabStripController() {
   // When we get here the TabStrip is being deleted. We need to explicitly
   // cancel the menu, otherwise it may try to invoke something on the tabstrip
@@ skipping 134 matching lines @@
 bool BrowserTabStripController::IsCompatibleWith(BaseTabStrip* other) const {
   Profile* other_profile =
       static_cast<BrowserTabStripController*>(other->controller())->profile();
   return other_profile == profile();
 }
 
 void BrowserTabStripController::CreateNewTab() {
   UserMetrics::RecordAction(UserMetricsAction("NewTab_Button"),
                             model_->profile());
 
-  if (browser_ && browser_->OpenAppsPanelAsNewTab())
+  TabContents* selected_tab = model_->GetSelectedTabContents();
+  if (!selected_tab)
+    return;
+
+  Browser* browser = selected_tab->delegate()->GetBrowser();
+  if (browser->OpenAppsPanelAsNewTab())
     return;
 
   model_->delegate()->AddBlankTab(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserTabStripController, TabStripModelObserver implementation:
 
 void BrowserTabStripController::TabInsertedAt(TabContents* contents,
                                               int model_index,
@@ skipping 73 matching lines @@
                                              int model_index) {
   TabRendererData data;
   SetTabRendererDataFromModel(contents, model_index, &data);
   tabstrip_->SetTabData(model_index, data);
 }
 
 void BrowserTabStripController::SetTabRendererDataFromModel(
     TabContents* contents,
     int model_index,
     TabRendererData* data) {
-  SkBitmap* app_icon = NULL;
-
-  // Extension App icons are slightly larger than favicons, so only allow
-  // them if permitted by the model.
-  if (model_->delegate()->LargeIconsPermitted())
-    app_icon = contents->GetExtensionAppIcon();
-
+  SkBitmap* app_icon = contents->GetExtensionAppIcon();
   if (app_icon)
     data->favicon = *app_icon;
   else
     data->favicon = contents->GetFavIcon();
   data->network_state = TabContentsNetworkState(contents);
   data->title = contents->GetTitle();
   data->loading = contents->is_loading();
   data->crashed = contents->is_crashed();
   data->off_the_record = contents->profile()->IsOffTheRecord();
   data->show_icon = contents->ShouldDisplayFavIcon();
@@ skipping 38 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();
 }