mojo/shell/standalone/context.cc - Issue 1791663002: Allow Catalogs to be constructed per-user

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: mojo/shell/standalone/context.cc

Issue 1791663002: Allow Catalogs to be constructed per-user (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@49catalog

Patch Set: . Created 4 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:

Index: mojo/shell/standalone/context.cc

diff --git a/mojo/shell/standalone/context.cc b/mojo/shell/standalone/context.cc

index 68d5c3ac2d18136684f25bb48c0a2a3029351eaf..dc0a25bb59e40f96ab215858be476ae558d16f56 100644

--- a/mojo/shell/standalone/context.cc

+++ b/mojo/shell/standalone/context.cc

@@ -29,7 +29,7 @@

#include "components/tracing/tracing_switches.h"

#include "mojo/edk/embedder/embedder.h"

#include "mojo/public/cpp/bindings/strong_binding.h"

-#include "mojo/services/catalog/owner.h"

+#include "mojo/services/catalog/factory.h"

#include "mojo/services/catalog/store.h"

#include "mojo/services/tracing/public/cpp/switches.h"

#include "mojo/services/tracing/public/cpp/trace_provider_impl.h"

@@ -155,7 +155,7 @@ void Context::Init(scoped_ptr<InitParams> init_params) {

scoped_ptr<catalog::Store> store;

if (init_params)

store = std::move(init_params->catalog_store);

- catalog_.reset(new catalog::Owner(blocking_pool_.get(), std::move(store)));

+ catalog_.reset(new catalog::Factory(blocking_pool_.get(), std::move(store)));

shell_.reset(new Shell(std::move(runner_factory),

catalog_->TakeShellClient()));

« no previous file with comments | « mojo/shell/standalone/context.h ('k') | mojo/shell/tests/loader_unittest.cc » ('j') | no next file with comments »