Don't update icon of chrome app shortcuts from the favicon of the hosted URL.

chrome/browser/ui/browser.cc

 // Copyright (c) 2010 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 <shellapi.h>
 #include <windows.h>
 #endif  // OS_WIN
@@ skipping 507 matching lines @@
     Profile* profile,
     const Extension* extension,
     extension_misc::LaunchContainer container,
     TabContents* existing_tab) {
   TabContents* tab = NULL;
 
   UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100);
 
   switch (container) {
     case extension_misc::LAUNCH_WINDOW:
-      tab = Browser::OpenApplicationWindow(profile,
-                                           extension->GetFullLaunchURL());
+      // TODO(skerner): Setting |extension| to NULL is odd.
+      // Not doing so triggers some vestigial extensions app window
+      // behavior that leads to crashes.  This sort of window is no
+      // longer supported, and its remains need to be cleaned up.
+      // crbug/65630 tracks this cleanup.
+      tab = Browser::OpenApplicationWindow(profile, NULL, container,
+                                           extension->GetFullLaunchURL(),
+                                           NULL);
       break;
     case extension_misc::LAUNCH_PANEL:
       tab = Browser::OpenApplicationWindow(profile, extension, container,
-                                           GURL());
+                                           GURL(), NULL);
       break;
     case extension_misc::LAUNCH_TAB: {
       tab = Browser::OpenApplicationTab(profile, extension, existing_tab);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
   return tab;
 }
 
 // static
 TabContents* Browser::OpenApplicationWindow(
     Profile* profile,
     const Extension* extension,
     extension_misc::LaunchContainer container,
-    const GURL& url_input) {
+    const GURL& url_input,
+    Browser** app_browser) {
   GURL url;
   if (!url_input.is_empty()) {
     if (extension)
       DCHECK(extension->web_extent().ContainsURL(url_input));
     url = url_input;
   } else {
     DCHECK(extension);
     url = extension->GetFullLaunchURL();
   }
 
   // TODO(erikkay) this can't be correct for extensions
   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
   RegisterAppPrefs(app_name);
 
   bool as_panel = extension && (container == extension_misc::LAUNCH_PANEL);
   Browser* browser = Browser::CreateForApp(app_name, extension, profile,
                                            as_panel);
+  if (app_browser)
+    *app_browser = browser;
+
   TabContentsWrapper* wrapper =
       browser->AddSelectedTabWithURL(url, PageTransition::START_PAGE);
   TabContents* contents = wrapper->tab_contents();
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->render_view_host()->SyncRendererPrefs();
   browser->window()->Show();
 
   // TODO(jcampan): http://crbug.com/8123 we should not need to set the initial
   //                focus explicitly.
   contents->view()->SetInitialFocus();
+  return contents;
+}
 
-  if (!as_panel) {
+TabContents* Browser::OpenAppShortcutWindow(Profile* profile,
+                                            const GURL& url,
+                                            bool update_shortcut) {
+  Browser* app_browser;
+  TabContents* tab = OpenApplicationWindow(
+      profile,
+      NULL,  // this is a URL app.  No extension.
+      extension_misc::LAUNCH_WINDOW,
+      url,
+      &app_browser);
+
+  if (!tab)
+    return NULL;
+
+  if (update_shortcut) {
     // Set UPDATE_SHORTCUT as the pending web app action. This action is picked
     // up in LoadingStateChanged to schedule a GetApplicationInfo. And when
     // the web app info is available, TabContents notifies Browser via
     // OnDidGetApplicationInfo, which calls
     // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
     // pending web app action.
-    browser->pending_web_app_action_ = UPDATE_SHORTCUT;
+    app_browser->pending_web_app_action_ = UPDATE_SHORTCUT;
   }
-
-  return contents;
+  return tab;
 }
 
 // static
-TabContents* Browser::OpenApplicationWindow(Profile* profile, const GURL& url) {
-  return OpenApplicationWindow(profile, NULL, extension_misc::LAUNCH_WINDOW,
-                               url);
-}
-
-// static
 TabContents* Browser::OpenApplicationTab(Profile* profile,
                                          const Extension* extension,
                                          TabContents* existing_tab) {
   Browser* browser = BrowserList::GetLastActiveWithProfile(profile);
   TabContents* contents = NULL;
   if (!browser || browser->type() != Browser::TYPE_NORMAL)
     return contents;
 
   // Check the prefs for overridden mode.
   ExtensionsService* extensions_service = profile->GetExtensionsService();
@@ skipping 3532 matching lines @@
   NOTREACHED();
   return false;
 }
 
 void Browser::CreateInstantIfNecessary() {
   if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
       !profile()->IsOffTheRecord()) {
     instant_.reset(new InstantController(profile_, this));
   }
 }