Make the window icon the app icon by default for popups and app windows unless the page specifies a favicon. This ensures that we don't show the default favicon for the window icon. (This is only appropriate for tab icons).

Also make sure popup windows opened from app windows are themselves app windows (and don't show the URL bar)

B=1031854

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1293 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 6 deletions

diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index cc1e2c5..3d4d1ed 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -519,12 +519,8 @@ bool BrowserView2::ShouldShowWindowTitle() const {
 }
 
 SkBitmap BrowserView2::GetWindowIcon() {
-  if (browser_->GetType() == BrowserType::APPLICATION) {
-    SkBitmap favicon = browser_->GetCurrentPageIcon();
-    if (favicon.isNull())
-      return default_favicon_;
-    return favicon;
-  }
+  if (browser_->GetType() == BrowserType::APPLICATION)
+    return browser_->GetCurrentPageIcon();
   return SkBitmap();
 }