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

Side by Side Diff: mojo/shell/view_manager_loader.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « mojo/shell/view_manager_loader.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "mojo/shell/view_manager_loader.h" 5 #include "mojo/shell/view_manager_loader.h"
6 6
7 #include "mojo/public/cpp/application/application_connection.h" 7 #include "mojo/public/cpp/application/application_connection.h"
8 #include "mojo/public/cpp/application/application_impl.h" 8 #include "mojo/public/cpp/application/application_impl.h"
9 #include "mojo/services/view_manager/view_manager_init_service_impl.h" 9 #include "mojo/services/view_manager/view_manager_init_service_impl.h"
10 10
(...skipping 19 matching lines...) Expand all
30 scoped_ptr<ApplicationImpl> app( 30 scoped_ptr<ApplicationImpl> app(
31 new ApplicationImpl(this, shell_handle.Pass())); 31 new ApplicationImpl(this, shell_handle.Pass()));
32 apps_.push_back(app.release()); 32 apps_.push_back(app.release());
33 } 33 }
34 34
35 void ViewManagerLoader::OnServiceError(ServiceManager* manager, 35 void ViewManagerLoader::OnServiceError(ServiceManager* manager,
36 const GURL& url) { 36 const GURL& url) {
37 } 37 }
38 38
39 bool ViewManagerLoader::ConfigureIncomingConnection( 39 bool ViewManagerLoader::ConfigureIncomingConnection(
40 ApplicationConnection* connection) { 40 ApplicationConnection* connection) {
41 context_.ConfigureIncomingConnection(connection);
41 connection->AddService(this); 42 connection->AddService(this);
42 return true; 43 return true;
43 } 44 }
44 45
45 void ViewManagerLoader::Create( 46 void ViewManagerLoader::Create(
46 ApplicationConnection* connection, 47 ApplicationConnection* connection,
47 InterfaceRequest<ViewManagerInitService> request) { 48 InterfaceRequest<ViewManagerInitService> request) {
48 BindToRequest(new ViewManagerInitServiceImpl(connection), &request); 49 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_),
50 &request);
49 } 51 }
50 52
51 } // namespace shell 53 } // namespace shell
52 } // namespace mojo 54 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/shell/view_manager_loader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698