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: Rebase + review comments addressed 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

« chrome/browser/extensions/convert_web_app_unittest.cc ('K') | « chrome/browser/extensions/convert_web_app_unittest.cc ('k') | chrome/browser/extensions/extension_service.cc » ('j') | chrome/common/extensions/app_launcher_info.h » ('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 df2d71ecd11d1d402806e9691e2e287cba30cb71..8d473a9f45cea71b8620824d76dbc7b4fd1e2894 100644

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

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

@@ -21,6 +21,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_launcher_info.h"

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

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

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

@@ -1278,7 +1279,7 @@ extension_misc::LaunchContainer ExtensionPrefs::GetLaunchContainer(

const Extension* extension,

ExtensionPrefs::LaunchType default_pref_value) {

extension_misc::LaunchContainer manifest_launch_container =

- extension->launch_container();

+ AppLauncherInfo::GetLaunchContainer(extension);

const extension_misc::LaunchContainer kInvalidLaunchContainer =

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