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

Unified Diff: mojo/services/view_manager/main.cc

Issue 400113005: A new WM bootstrap flow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 5 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/mojo_services.gypi ('k') | mojo/services/view_manager/view_manager_init_service_context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/view_manager/main.cc
diff --git a/mojo/services/view_manager/main.cc b/mojo/services/view_manager/main.cc
index 3a809969c11371796551dcd99d48c88de3daf74c..2254c76b19f47f143cd3949fa3cbb8a154122706 100644
--- a/mojo/services/view_manager/main.cc
+++ b/mojo/services/view_manager/main.cc
@@ -4,6 +4,7 @@
#include "mojo/public/cpp/application/application_connection.h"
#include "mojo/public/cpp/application/application_delegate.h"
+#include "mojo/services/view_manager/view_manager_init_service_context.h"
#include "mojo/services/view_manager/view_manager_init_service_impl.h"
namespace mojo {
@@ -18,6 +19,7 @@ class ViewManagerApp : public ApplicationDelegate,
virtual bool ConfigureIncomingConnection(
ApplicationConnection* connection) OVERRIDE {
+ context_.ConfigureIncomingConnection(connection);
// TODO(sky): this needs some sort of authentication as well as making sure
// we only ever have one active at a time.
connection->AddService(this);
@@ -27,10 +29,13 @@ class ViewManagerApp : public ApplicationDelegate,
virtual void Create(
ApplicationConnection* connection,
InterfaceRequest<ViewManagerInitService> request) OVERRIDE {
- BindToRequest(new ViewManagerInitServiceImpl(connection), &request);
+ BindToRequest(new ViewManagerInitServiceImpl(connection, &context_),
+ &request);
}
private:
+ ViewManagerInitServiceContext context_;
+
DISALLOW_COPY_AND_ASSIGN(ViewManagerApp);
};
« no previous file with comments | « mojo/mojo_services.gypi ('k') | mojo/services/view_manager/view_manager_init_service_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698