Revert 54560 - ...

chrome/browser/tab_contents/tab_contents.cc

Index: chrome/browser/tab_contents/tab_contents.cc
===================================================================
--- chrome/browser/tab_contents/tab_contents.cc	(revision 54564)
+++ chrome/browser/tab_contents/tab_contents.cc	(working copy)
@@ -23,6 +23,7 @@
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/blocked_popup_container.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/cert_store.h"
@@ -538,6 +539,13 @@
 }
 
 SkBitmap* TabContents::GetExtensionAppIcon() {
+  // We don't show the big icons in tabs for TYPE_EXTENSION_APP windows because
+  // for those windows, we already have a big icon in the top-left outside any
+  // tab. Having big tab icons too looks kinda redonk.
+  Browser* browser = delegate_ ? delegate_->GetBrowser() : NULL;
+  if (browser && browser->type() == Browser::TYPE_EXTENSION_APP)
+    return NULL;
+
   if (extension_app_icon_.empty())
     return NULL;