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

chrome/browser/ui/browser.cc

 // Copyright 2012 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/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 115 matching lines @@
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 #include "chrome/browser/ui/tabs/dock_info.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
 #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"
 #include "chrome/browser/ui/window_sizer/window_sizer.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/browser/upgrade_detector.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
@@ skipping 370 matching lines @@
   return !app_name_.empty();
 }
 
 bool Browser::is_devtools() const {
   return app_name_ == DevToolsWindow::kDevToolsApp;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, State Storage and Retrieval for UI:
 
-gfx::Image Browser::GetCurrentPageIcon() const {
+const gfx::Image* Browser::GetCurrentPageIcon(int dimension) const {

[benwells, 2013/11/13 21:55:17]

Maybe this function can move off browser? It just uses the tab helper anyway,
can't callers get the tab helper and use it themselves?

[calamity, 2013/11/15 04:25:50]

Done.

   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();
+  HostedAppTabHelper* hosted_app_tab_helper =
+      web_contents ? HostedAppTabHelper::FromWebContents(web_contents)
+                   : NULL;
+  return hosted_app_tab_helper
+      ? hosted_app_tab_helper->image_family().GetBest(dimension, dimension)
+      : NULL;
 }
 
 string16 Browser::GetWindowTitleForCurrentTab() const {
   WebContents* contents = tab_strip_model_->GetActiveWebContents();
   string16 title;
 
   // |contents| can be NULL because GetWindowTitleForCurrentTab is called by the
   // window during the window's creation (before tabs have been added).
   if (contents) {
     title = contents->GetTitle();
@@ skipping 1191 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, BookmarkTabHelperDelegate implementation:
 
 void Browser::URLStarredChanged(content::WebContents* web_contents,
                                 bool starred) {
   if (web_contents == tab_strip_model_->GetActiveWebContents())
     window_->SetStarredState(starred);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
+// 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,
                             bool can_show_bubble) {
   if (source == tab_strip_model_->GetActiveWebContents()) {
     // Only show the zoom bubble for zoom changes in the active window.
     window_->ZoomChangedForActiveTab(can_show_bubble && window_->IsActive());
   }
 }
 
@@ skipping 318 matching lines @@
   BookmarkTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   WebContentsModalDialogManager::FromWebContents(web_contents)->
       SetDelegate(delegate);
   CoreTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   SearchEngineTabHelper::FromWebContents(web_contents)->set_delegate(delegate);
   ZoomController::FromWebContents(web_contents)->set_observer(delegate);
   TranslateTabHelper* translate_tab_helper =
       TranslateTabHelper::FromWebContents(web_contents);
   translate_tab_helper->language_state().set_observer(
       delegate ? delegate->language_state_observer_.get() : NULL);
+#if defined(OS_WIN)

[tapted, 2013/11/13 07:44:53]

If it's still needed, maybe move this #ifdef to HostedAppTabHelper::SetDelegate?
browser.cc is too big to have #ifdefs

[benwells, 2013/11/13 21:55:17]

Yeah no ifdefs in here please. There is browser_win.cc for windows specific
stuff as well
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/....

[calamity, 2013/11/15 04:25:50]

Moved the #ifdef into HostedAppTabHelper::SetDelegate.

+  if (is_app()) {
+    // We need the window icon for hosted apps running as a window on Windows.
+    HostedAppTabHelper::FromWebContents(web_contents)->
+        SetDelegate(delegate, true  /* fetch_icons_immediately*/);

[benwells, 2013/11/13 21:55:17]

Is it ever called with fetch_icons_immediately false?

[calamity, 2013/11/15 04:25:50]

Nope. Moved the setting of this into HostedAppTabHelper::SetDelegate.

+  }
+#endif
+
 }
 
 void Browser::CloseFrame() {
   window_->Close();
 }
 
 void Browser::TabDetachedAtImpl(content::WebContents* contents,
                                 int index,
                                 DetachType type) {
   if (type == DETACH_TYPE_DETACH) {
@@ skipping 179 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }