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

Unified Diff: apps/shell/browser/shell_browser_main_parts.cc

Issue 195943018: Move extensions BCKS factory creation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move stuff back out of PreProfileInit (because TestingProfile) Created 6 years, 9 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
Index: apps/shell/browser/shell_browser_main_parts.cc
diff --git a/apps/shell/browser/shell_browser_main_parts.cc b/apps/shell/browser/shell_browser_main_parts.cc
index e506e81a69e63091b3dbb0fdcd685b0a7610a1b2..7dcbfaffa7349f08c53501d3fe28e19a69ff45bd 100644
--- a/apps/shell/browser/shell_browser_main_parts.cc
+++ b/apps/shell/browser/shell_browser_main_parts.cc
@@ -4,6 +4,7 @@
#include "apps/shell/browser/shell_browser_main_parts.h"
+#include "apps/browser_context_keyed_service_factories.h"
#include "apps/shell/browser/shell_apps_client.h"
#include "apps/shell/browser/shell_browser_context.h"
#include "apps/shell/browser/shell_extension_system.h"
@@ -19,8 +20,8 @@
#include "content/public/common/result_codes.h"
#include "content/shell/browser/shell_devtools_delegate.h"
#include "content/shell/browser/shell_net_log.h"
+#include "extensions/browser/context_keyed_service_factories.h"
#include "extensions/browser/extension_system.h"
-#include "extensions/browser/renderer_startup_helper.h"
#include "ui/aura/env.h"
#include "ui/aura/test/test_screen.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -38,13 +39,13 @@ using extensions::Extension;
using extensions::ExtensionSystem;
using extensions::ShellExtensionSystem;
-namespace apps {
namespace {
// Register additional KeyedService factories here. See
// ChromeBrowserMainExtraPartsProfiles for details.
void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
- extensions::RendererStartupHelperFactory::GetInstance();
+ apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+ extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
extensions::ShellExtensionSystemFactory::GetInstance();
}
@@ -71,6 +72,8 @@ class ShellViewsDelegate : public views::TestViewsDelegate {
} // namespace
+namespace apps {
+
ShellBrowserMainParts::ShellBrowserMainParts(
const content::MainFunctionParams& parameters)
: extension_system_(NULL) {
@@ -121,7 +124,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
// TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
CreateExtensionSystem();
- EnsureBrowserContextKeyedServiceFactoriesBuilt();
+ ::EnsureBrowserContextKeyedServiceFactoriesBuilt();
BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
browser_context_.get());

Powered by Google App Engine
This is Rietveld 408576698