Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(17)

Unified Diff: chrome/browser/extensions/extension_prefs.cc

Issue 5560007: Don't update icon of chrome app shortcuts from the favicon of the hosted URL. (Closed)
Patch Set: Rev commnets Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/browser.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_prefs.cc
diff --git a/chrome/browser/extensions/extension_prefs.cc b/chrome/browser/extensions/extension_prefs.cc
index 4ab239dab1bae41361bc2588dfe37dad16ad04e5..7b5909364c2292fb9104c35cb2ffd578461a7c88 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -604,6 +604,11 @@ extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(
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);
« no previous file with comments | « no previous file | chrome/browser/ui/browser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698