Revert 54560 - ...

chrome/browser/views/tabs/browser_tab_strip_controller.cc

Index: chrome/browser/views/tabs/browser_tab_strip_controller.cc
===================================================================
--- chrome/browser/views/tabs/browser_tab_strip_controller.cc	(revision 54564)
+++ chrome/browser/views/tabs/browser_tab_strip_controller.cc	(working copy)
@@ -112,11 +112,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 // 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,
@@ -271,9 +269,14 @@
   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);
 }
 
@@ -365,13 +368,7 @@
     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