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

Unified Diff: mojo/shell/context.cc

Issue 122173004: Add test for ServiceManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update new copyrights Created 6 years, 12 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 | « mojo/shell/context.h ('k') | mojo/shell/dynamic_service_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/shell/context.cc
diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
index 4336ecff86a3f87c211a446e3099b24eaff35249..6eb8f0b517232a553b0a75f3066206fb2a4619bd 100644
--- a/mojo/shell/context.cc
+++ b/mojo/shell/context.cc
@@ -4,6 +4,7 @@
#include "mojo/shell/context.h"
+#include "mojo/shell/dynamic_service_loader.h"
#include "mojo/shell/network_delegate.h"
#include "mojo/system/core_impl.h"
@@ -20,10 +21,12 @@ Context::Context()
storage_.profile_path()) {
system::CoreImpl::Init();
BindingsSupport::Set(&bindings_support_impl_);
- service_manager_.reset(new ServiceManager(this));
+ dynamic_service_loader_.reset(new DynamicServiceLoader(this));
+ service_manager_.set_default_loader(dynamic_service_loader_.get());
}
Context::~Context() {
+ service_manager_.set_default_loader(NULL);
BindingsSupport::Set(NULL);
}
« no previous file with comments | « mojo/shell/context.h ('k') | mojo/shell/dynamic_service_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698