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

Unified Diff: shell/context.cc

Issue 1327033004: Allow building mojo_shell and non-graphical apps/services on a Mac (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: review feedback 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/application_manager/network_fetcher.cc ('k') | shell/pingable_app_dummy_empty.cc » ('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 19642085b12e08d00772f5d87c48dbc93159b48e..2efe7aef4ab76524f1857b41516ea34f5a631c44 100644
--- a/shell/context.cc
+++ b/shell/context.cc
@@ -38,9 +38,12 @@
#include "shell/out_of_process_native_runner.h"
#include "shell/switches.h"
#include "shell/tracer.h"
-#include "shell/url_response_disk_cache_loader.h"
#include "url/gurl.h"
+#if !defined(OS_MACOSX)
+#include "shell/url_response_disk_cache_loader.h"
+#endif
+
using mojo::ServiceProvider;
using mojo::ServiceProviderPtr;
@@ -272,12 +275,14 @@ bool Context::InitWithPaths(const base::FilePath& shell_child_path) {
task_runners_.reset(
new TaskRunners(base::MessageLoop::current()->message_loop_proxy()));
+#if !defined(OS_MACOSX)
application_manager()->SetLoaderForURL(
make_scoped_ptr(new BackgroundApplicationLoader(
make_scoped_ptr(
new URLResponseDiskCacheLoader(task_runners_->blocking_pool())),
"url_response_disk_cache", base::MessageLoop::TYPE_DEFAULT)),
GURL("mojo:url_response_disk_cache"));
+#endif
EnsureEmbedderIsInitialized();
« no previous file with comments | « shell/application_manager/network_fetcher.cc ('k') | shell/pingable_app_dummy_empty.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698