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

chrome/browser/ui/browser_init.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_init.h"
 
 #include <algorithm>   // For max().
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 610 matching lines @@
 
   // This can fail if the app_id is invalid.  It can also fail if the
   // extension is external, and has not yet been installed.
   // TODO(skerner): Do something reasonable here. Pop up a warning panel?
   // Open an URL to the gallery page of the extension id?
   if (!app_id.empty()) {
     ExtensionsService* extensions_service = profile->GetExtensionsService();
     const Extension* extension =
         extensions_service->GetExtensionById(app_id, false);
 
-    // The extension with |app_id| may have been uninstalled.
+    // The extension with id |app_id| may have been uninstalled.
     if (!extension)
       return false;
 
-    // Look at prefs to find the container in which an app should launch.
-    // If no preference is set, launch in a window.
+    // Look at preferences to find the right launch container.  If no
+    // preference is set, launch as a window.
     extension_misc::LaunchContainer launch_container =
         extensions_service->extension_prefs()->GetLaunchContainer(
             extension, ExtensionPrefs::LAUNCH_WINDOW);
 
     TabContents* app_window = Browser::OpenApplication(
         profile, extension, launch_container, NULL);
     return (app_window != NULL);
   }
 
   if (url_string.empty())
     return false;
 
 #if defined(OS_WIN)  // Fix up Windows shortcuts.
   ReplaceSubstringsAfterOffset(&url_string, 0, "\\x", "%");
 #endif
   GURL url(url_string);
 
   // Restrict allowed URLs for --app switch.
   if (!url.is_empty() && url.is_valid()) {
     ChildProcessSecurityPolicy *policy =
         ChildProcessSecurityPolicy::GetInstance();
     if (policy->IsWebSafeScheme(url.scheme()) ||
         url.SchemeIs(chrome::kFileScheme)) {
-      Browser::OpenApplicationWindow(profile, url);
-      return true;
+      TabContents* app_window = Browser::OpenUrlAppShortcutWindow(

[Aaron Boodman, 2010/12/06 23:45:24]

app_widow -> app_tab?

[Sam Kerner (Chrome), 2010/12/07 04:12:30]

Done.

+          profile,
+          url,
+          true);  // Update app info.
+      return (app_window != NULL);
     }
   }
   return false;
 }
 
 void BrowserInit::LaunchWithProfile::ProcessLaunchURLs(
     bool process_startup,
     const std::vector<GURL>& urls_to_open) {
   // If we're starting up in "background mode" (no open browser window) then
   // don't open any browser windows.
@@ skipping 417 matching lines @@
     return false;
   automation->SetExpectedTabCount(expected_tabs);
 
   AutomationProviderList* list =
       g_browser_process->InitAutomationProviderList();
   DCHECK(list);
   list->AddProvider(automation);
 
   return true;
 }