chrome/browser/profiles/profile_dependency_manager.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/profiles/profile_dependency_manager.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/tab_helper.cc ('k') | chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.cc » ('j') | chrome/common/extensions/app_launcher_info.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_dependency_manager.cc

diff --git a/chrome/browser/profiles/profile_dependency_manager.cc b/chrome/browser/profiles/profile_dependency_manager.cc

index abd2a29a361d76568d39c8db5c70f8d9358313f2..67de42d71828715def15034f40b29daaded7383f 100644

--- a/chrome/browser/profiles/profile_dependency_manager.cc

+++ b/chrome/browser/profiles/profile_dependency_manager.cc

@@ -44,6 +44,7 @@

#include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"

#include "chrome/browser/extensions/api/themes/theme_api.h"

#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"

+#include "chrome/browser/extensions/app_launch_manifest_parser.h"

#include "chrome/browser/extensions/csp_parser.h"

#include "chrome/browser/extensions/extension_system_factory.h"

#include "chrome/browser/extensions/install_tracker_factory.h"

@@ -263,6 +264,7 @@ void ProfileDependencyManager::AssertFactoriesBuilt() {

#if defined(ENABLE_EXTENSIONS)

apps::AppRestoreServiceFactory::GetInstance();

extensions::ActivityLogFactory::GetInstance();

+ extensions::AppLaunchManifestParser::GetFactoryInstance();

extensions::BookmarksAPI::GetFactoryInstance();

extensions::BluetoothAPIFactory::GetInstance();

extensions::CommandService::GetFactoryInstance();