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

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

Issue 8734016: Make platform apps use and require a different container ("shell" instead of "panel") (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 9 years, 1 month 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/extensions/platform_app_browsertest.cc » ('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 ebe337cc0b60403f3c82af43d9fae8d2f6495a9b..e8eed1812b0d35734965398e144ff11c24b6bf86 100644
--- a/chrome/browser/extensions/extension_prefs.cc
+++ b/chrome/browser/extensions/extension_prefs.cc
@@ -973,10 +973,11 @@ extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(
extension_misc::LaunchContainer result = kInvalidLaunchContainer;
- if (manifest_launch_container == extension_misc::LAUNCH_PANEL) {
- // Apps with app.launch.container = 'panel' should always
- // open in a panel.
- result = extension_misc::LAUNCH_PANEL;
+ if (manifest_launch_container == extension_misc::LAUNCH_PANEL ||
+ manifest_launch_container == extension_misc::LAUNCH_SHELL) {
+ // Apps with app.launch.container = 'panel' or 'shell' should always respect
+ // the manifest setting.
+ result = manifest_launch_container;
} else if (manifest_launch_container == extension_misc::LAUNCH_TAB) {
// Look for prefs that indicate the user's choice of launch
« no previous file with comments | « no previous file | chrome/browser/extensions/platform_app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698