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

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 7f851351abc0f36fe118305b0567dc71a551a7f1..27af039eebaf5f1d556fda3b0f5774f0f308dac4 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -29,6 +29,7 @@
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/toolbar/toolbar_model.h"
+#include "chrome/browser/ui/web_applications/hosted_app_tab_helper_delegate.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
@@ -99,6 +100,7 @@ class Browser : public TabStripModelObserver,
                 public SearchEngineTabHelperDelegate,
                 public ChromeWebModalDialogManagerDelegate,
                 public BookmarkTabHelperDelegate,
+                public HostedAppTabHelperDelegate,
                 public ZoomObserver,
                 public content::PageNavigator,
                 public content::NotificationObserver,
@@ -281,8 +283,8 @@ class Browser : public TabStripModelObserver,
 
   // State Storage and Retrieval for UI ///////////////////////////////////////
 
-  // Gets the Favicon of the page in the selected tab.
-  gfx::Image GetCurrentPageIcon() const;
+  // Gets the Favicon of the page in the selected tab .

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

nit: stray space wants more documentation (I suggested `Gets the best Favicon of
the page in the selected tab to fit in a square of |dimension| width in
pixels.`)

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

Done.

+  const gfx::Image* GetCurrentPageIcon(int dimension) const;

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

Ah - I meant go back to what was there previously, before `const` was added. 
I.e. doing `return *icon;` into non-const gfx::Image shouldn't care that the
pointer is const, since it's copying it anyway. But if compiler doesn't like
that `return gfx::Image(*icon);` should work.

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

Done.

 
   // Gets the title of the window based on the selected tab's title.
   string16 GetWindowTitleForCurrentTab() const;
@@ -679,6 +681,9 @@ class Browser : public TabStripModelObserver,
   virtual void URLStarredChanged(content::WebContents* web_contents,
                                  bool starred) OVERRIDE;
 
+  // Overriden from HostedAppTabHelper:
+  virtual void OnWindowIconLoaded(content::WebContents* source) OVERRIDE;
+
   // Overridden from ZoomObserver:
   virtual void OnZoomChanged(content::WebContents* source,
                              bool can_show_bubble) OVERRIDE;