chrome/browser/extensions/extension_prefs.cc - Issue 12316077: Move the parsing of app.launch related keys out of Extension class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 12316077: Move the parsing of app.launch related keys out of Extension class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 10 months 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 | « chrome/browser/extensions/convert_web_app_unittest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | chrome/browser/ui/tabs/tab_strip_model_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 38dcaf38f7f1a912e693eb9aeb8f2ba5436aadc7..8c853070b41a1d2adb28dd54d9424a0b2d0f3bc1 100644

--- a/chrome/browser/extensions/extension_prefs.cc

+++ b/chrome/browser/extensions/extension_prefs.cc

@@ -20,6 +20,7 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

+#include "chrome/common/extensions/app_launch_manifest_handler.h"

#include "chrome/common/extensions/feature_switch.h"

#include "chrome/common/extensions/manifest.h"

#include "chrome/common/extensions/permissions/permission_set.h"

@@ -1212,7 +1213,7 @@ extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(

const Extension* extension,

ExtensionPrefs::LaunchType default_pref_value) {

extension_misc::LaunchContainer manifest_launch_container =

- extension->launch_container();

+ AppLaunchInfo::GetLaunchContainer(extension);

const extension_misc::LaunchContainer kInvalidLaunchContainer =

static_cast<extension_misc::LaunchContainer>(-1);