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

chrome/browser/ui/browser.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_BROWSER_H_
 #define CHROME_BROWSER_UI_BROWSER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 11 matching lines @@
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #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"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/page_zoom.h"
@@ skipping 50 matching lines @@
 namespace web_modal {
 class WebContentsModalDialogHost;
 }
 
 class Browser : public TabStripModelObserver,
                 public content::WebContentsDelegate,
                 public CoreTabHelperDelegate,
                 public SearchEngineTabHelperDelegate,
                 public ChromeWebModalDialogManagerDelegate,
                 public BookmarkTabHelperDelegate,
+                public HostedAppTabHelperDelegate,
                 public ZoomObserver,
                 public content::PageNavigator,
                 public content::NotificationObserver,
                 public ui::SelectFileDialog::Listener {
  public:
   // SessionService::WindowType mirrors these values.  If you add to this
   // enum, look at SessionService::WindowType to see if it needs to be
   // updated.
   enum Type {
     // If you add a new type, consider updating the test
@@ skipping 162 matching lines @@
   FindBarController* GetFindBarController();
 
   // Returns true if a FindBarController exists for this browser.
   bool HasFindBarController() const;
 
   // Returns the state of the bookmark bar.
   BookmarkBar::State bookmark_bar_state() const { return bookmark_bar_state_; }
 
   // 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;
 
   // Prepares a title string for display (removes embedded newlines, etc).
   static void FormatTitleForDisplay(string16* title);
 
   // OnBeforeUnload handling //////////////////////////////////////////////////
 
   // Gives beforeunload handlers the chance to cancel the close. Returns whether
@@ skipping 376 matching lines @@
   // Overridden from WebContentsModalDialogManagerDelegate:
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
                                      bool blocked) OVERRIDE;
   virtual web_modal::WebContentsModalDialogHost*
       GetWebContentsModalDialogHost() OVERRIDE;
 
   // Overridden from BookmarkTabHelperDelegate:
   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;
 
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const base::FilePath& path,
                             int index,
                             void* params) OVERRIDE;
   virtual void FileSelectedWithExtraInfo(
       const ui::SelectedFileInfo& file_info,
@@ skipping 243 matching lines @@
 
   // The following factory is used to close the frame at a later time.
   base::WeakPtrFactory<Browser> weak_factory_;
 
   scoped_ptr<BrowserLanguageStateObserver> language_state_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(Browser);
 };
 
 #endif  // CHROME_BROWSER_UI_BROWSER_H_