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

chrome/browser/ui/gtk/browser_titlebar.cc

 // 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.
 
 #include "chrome/browser/ui/gtk/browser_titlebar.h"
 
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <string>
@@ skipping 26 matching lines @@
 #endif
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/nine_box.h"
 #include "chrome/browser/ui/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/ui/gtk/unity_service.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 #include "chrome/browser/ui/toolbar/wrench_menu_model.h"
+#include "chrome/browser/ui/web_applications/hosted_app_tab_helper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 550 matching lines @@
   string16 title = browser_window_->browser()->GetWindowTitleForCurrentTab();
   gtk_label_set_text(GTK_LABEL(app_mode_title_), UTF16ToUTF8(title).c_str());
 
   if (browser_window_->browser()->is_app()) {
     switch (browser_window_->browser()->type()) {
       case Browser::TYPE_POPUP: {
         // Update the system app icon.  We don't need to update the icon in the
         // top left of the custom frame, that will get updated when the
         // throbber is updated.
         Profile* profile = browser_window_->browser()->profile();
-        gfx::Image icon = browser_window_->browser()->GetCurrentPageIcon();
-        if (icon.IsEmpty()) {
+        WebContents* web_contents = browser_window_->browser()->

[tapted, 2013/11/17 23:28:50]

This is a lot of boilerplate, that's repeated below and in browser_view.cc. What
about

static gfx::Image HostedAppTabHelper::IconForBrowser(Browser*);

+            tab_strip_model()->GetActiveWebContents();
+        HostedAppTabHelper* hosted_app_tab_helper =
+            web_contents ? HostedAppTabHelper::FromWebContents(web_contents)
+                         : NULL;
+        const gfx::Image* icon = hosted_app_tab_helper
+            ? hosted_app_tab_helper->image_family().GetBest(
+                  IconUtil::kMediumIconSize, IconUtil::kMediumIconSize)
+            : NULL;
+        if (!icon || icon->IsEmpty()) {
           gtk_util::SetWindowIcon(window_, profile);
         } else {
-          gtk_util::SetWindowIcon(window_, profile, icon.ToGdkPixbuf());
+          gtk_util::SetWindowIcon(window_, profile, icon->ToGdkPixbuf());
         }
         break;
       }
       case Browser::TYPE_TABBED: {
         NOTREACHED() << "We should never have a tabbed app window.";
         break;
       }
     }
   }
 }
 
 void BrowserTitlebar::UpdateThrobber(WebContents* web_contents) {
   DCHECK(app_mode_favicon_);
 
   if (web_contents && web_contents->IsLoading()) {
     GdkPixbuf* icon_pixbuf =
         throbber_.GetNextFrame(web_contents->IsWaitingForResponse());
     gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_), icon_pixbuf);
   } else {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
     // Note: we want to exclude the application popup/panel window.
     if ((browser_window_->browser()->is_app() &&
         !browser_window_->browser()->is_type_tabbed()) ||
         browser_window_->browser()->is_type_popup()) {
-      gfx::Image icon = browser_window_->browser()->GetCurrentPageIcon();
-      if (icon.IsEmpty()) {
+      WebContents* web_contents = browser_window_->browser()->
+          tab_strip_model()->GetActiveWebContents();
+      HostedAppTabHelper* hosted_app_tab_helper =
+          web_contents ? HostedAppTabHelper::FromWebContents(web_contents)
+                       : NULL;
+      const gfx::Image* icon = hosted_app_tab_helper
+          ? hosted_app_tab_helper->image_family().GetBest(
+                IconUtil::kMediumIconSize, IconUtil::kMediumIconSize)
+          : NULL;
+      if (!icon || icon->IsEmpty()) {
         // Fallback to the Chromium icon if the page has no icon.
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
             rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
       } else {
         gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
-                                  icon.ToGdkPixbuf());
+                                  icon->ToGdkPixbuf());
       }
     } else {
       gtk_image_set_from_pixbuf(GTK_IMAGE(app_mode_favicon_),
           rb.GetNativeImageNamed(IDR_PRODUCT_LOGO_16).ToGdkPixbuf());
     }
     throbber_.Reset();
   }
 }
 
 void BrowserTitlebar::UpdateTitlebarAlignment() {
@@ skipping 431 matching lines @@
     ui::SimpleMenuModel::Delegate* delegate)
     : SimpleMenuModel(delegate) {
   AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
   AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
   AddSeparator(ui::NORMAL_SEPARATOR);
   AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
   AddSeparator(ui::NORMAL_SEPARATOR);
   AddCheckItemWithStringId(kShowWindowDecorationsCommand,
                            IDS_SHOW_WINDOW_DECORATIONS_MENU);
 }