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

Unified Diff: shell/context.cc

Issue 1364243002: Bundle core applicatons in the shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Follow review 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 | « shell/context.h ('k') | shell/url_response_disk_cache_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/context.cc
diff --git a/shell/context.cc b/shell/context.cc
index fe1ffafae842635195b5b34d97eff49d74508724..65e11f16dcbe4704048b017408dd11a4a442f597 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -264,10 +264,12 @@ bool Context::Init() {
base::CommandLine::ForCurrentProcess()->GetProgram());
base::FilePath shell_child_path =
shell_path.DirName().AppendASCII("mojo_shell_child");
- return InitWithPaths(shell_child_path);
+ return InitWithPaths(shell_child_path, nullptr);
}
-bool Context::InitWithPaths(const base::FilePath& shell_child_path) {
+bool Context::InitWithPaths(
+ const base::FilePath& shell_child_path,
+ mojo::URLResponseDiskCacheDelegate* url_response_disk_cache_delegate) {
TRACE_EVENT0("mojo_shell", "Context::InitWithPaths");
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
@@ -284,7 +286,8 @@ bool Context::InitWithPaths(const base::FilePath& shell_child_path) {
application_manager()->SetLoaderForURL(
make_scoped_ptr(new BackgroundApplicationLoader(
make_scoped_ptr(
- new URLResponseDiskCacheLoader(task_runners_->blocking_pool())),
+ new URLResponseDiskCacheLoader(task_runners_->blocking_pool(),
+ url_response_disk_cache_delegate)),
"url_response_disk_cache", base::MessageLoop::TYPE_DEFAULT)),
GURL("mojo:url_response_disk_cache"));
#endif
« no previous file with comments | « shell/context.h ('k') | shell/url_response_disk_cache_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698