Use high resolution icons where possible for streamlined hosted app icons.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index dab977c681456a56a9619729ec8bb6fbe5123e59..3d5bad2473323b38ce2a1f2d534a657bfd5d7af9 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -55,7 +55,6 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/tab_helper.h"
-#include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/google/google_url_tracker.h"
@@ -133,6 +132,7 @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
 #include "chrome/browser/ui/unload_controller.h"
+#include "chrome/browser/ui/web_applications/hosted_app_tab_helper.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
@@ -528,15 +528,6 @@ bool Browser::is_devtools() const {
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, State Storage and Retrieval for UI:
 
-gfx::Image Browser::GetCurrentPageIcon() const {
-  WebContents* web_contents = tab_strip_model_->GetActiveWebContents();
-  // |web_contents| can be NULL since GetCurrentPageIcon() is called by the
-  // window during the window's creation (before tabs have been added).
-  FaviconTabHelper* favicon_tab_helper =
-      web_contents ? FaviconTabHelper::FromWebContents(web_contents) : NULL;
-  return favicon_tab_helper ? favicon_tab_helper->GetFavicon() : gfx::Image();
-}
-
 string16 Browser::GetWindowTitleForCurrentTab() const {
   WebContents* contents = tab_strip_model_->GetActiveWebContents();
   string16 title;
@@ -1746,6 +1737,14 @@ void Browser::URLStarredChanged(content::WebContents* web_contents,
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// Browser, HostedAppTabHelperDelegate implementation:
+
+void Browser::OnWindowIconLoaded(content::WebContents* source) {
+  window_->UpdateLoadingAnimations(tab_strip_model_->TabsAreLoading());
+  window_->UpdateTitleBar();
+}
+
+///////////////////////////////////////////////////////////////////////////////
 // Browser, ZoomObserver implementation:
 
 void Browser::OnZoomChanged(content::WebContents* source,
@@ -2084,6 +2083,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, Browser* delegate) {
       TranslateTabHelper::FromWebContents(web_contents);
   translate_tab_helper->language_state().set_observer(
       delegate ? delegate->language_state_observer_.get() : NULL);
+  if (is_app())
+    HostedAppTabHelper::FromWebContents(web_contents)->SetDelegate(delegate);
 }
 
 void Browser::CloseFrame() {