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

Unified Diff: content/browser/mojo/mojo_shell_context.cc

Issue 1358533004: Move more of ContentHandler handling into PackageManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 3 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 | « no previous file | mojo/BUILD.gn » ('j') | mojo/package_manager/content_handler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/mojo/mojo_shell_context.cc
diff --git a/content/browser/mojo/mojo_shell_context.cc b/content/browser/mojo/mojo_shell_context.cc
index 2c94008b0b694fd954649656b998b69ab48de59b..db77c35f4e5985c85594eab894d91f5e95fae11b 100644
--- a/content/browser/mojo/mojo_shell_context.cc
+++ b/content/browser/mojo/mojo_shell_context.cc
@@ -160,7 +160,7 @@ MojoShellContext::MojoShellContext() {
// Construct with an empty filepath since mojo: urls can't be registered now
// the url scheme registry is locked.
scoped_ptr<mojo::package_manager::PackageManagerImpl> package_manager(
- new mojo::package_manager::PackageManagerImpl(base::FilePath()));
+ new mojo::package_manager::PackageManagerImpl(base::FilePath(), nullptr));
yzshen1 2015/09/23 16:53:46 Passing null could crash in some cases (e.g., Loca
Ben Goodger (Google) 2015/09/23 18:24:20 Good point. Currently nullptr is equivalent to not
application_manager_.reset(
new mojo::shell::ApplicationManager(package_manager.Pass()));
« no previous file with comments | « no previous file | mojo/BUILD.gn » ('j') | mojo/package_manager/content_handler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698