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

chrome/browser/extensions/extension_prefs.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/extensions/extension_prefs.h"
 
 #include "base/string_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_notifier.h"
@@ skipping 586 matching lines @@
 
   return result;
 }
 
 extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(
     const Extension* extension,
     ExtensionPrefs::LaunchType default_pref_value) {
   extension_misc::LaunchContainer launch_container =
       extension->launch_container();
 
+  // Apps with app.launch.container = 'panel' should always
+  // open in a panel.
+  if (launch_container == extension_misc::LAUNCH_PANEL)
+    return extension_misc::LAUNCH_PANEL;
+
   ExtensionPrefs::LaunchType prefs_launch_type =
       GetLaunchType(extension->id(), default_pref_value);
 
   // If the user chose to open in a window, then launch in one.
   if (prefs_launch_type == ExtensionPrefs::LAUNCH_WINDOW)
     return extension_misc::LAUNCH_WINDOW;
 
   // Otherwise, use the container the extension chose.
   return launch_container;
 }
@@ skipping 672 matching lines @@
 void ExtensionPrefs::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(kExtensionsPref);
   prefs->RegisterListPref(kExtensionToolbar);
   prefs->RegisterIntegerPref(prefs::kExtensionToolbarSize, -1);
   prefs->RegisterDictionaryPref(kExtensionsBlacklistUpdate);
   prefs->RegisterListPref(prefs::kExtensionInstallAllowList);
   prefs->RegisterListPref(prefs::kExtensionInstallDenyList);
   prefs->RegisterListPref(prefs::kExtensionInstallForceList);
   prefs->RegisterStringPref(kWebStoreLogin, std::string() /* default_value */);
 }