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

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
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 16 matching lines...) Expand all
27 new ApplicationImpl(this, shell_handle.Pass())); 27 new ApplicationImpl(this, shell_handle.Pass()));
28 apps_.push_back(app.release()); 28 apps_.push_back(app.release());
29 } 29 }
30 30
31 void ViewManagerLoader::OnServiceError(ServiceManager* manager, 31 void ViewManagerLoader::OnServiceError(ServiceManager* manager,
32 const GURL& url) { 32 const GURL& url) {
33 } 33 }
34 34
35 bool ViewManagerLoader::ConfigureIncomingConnection( 35 bool ViewManagerLoader::ConfigureIncomingConnection(
36 mojo::ApplicationConnection* connection) { 36 mojo::ApplicationConnection* connection) {
37 connection->AddService<view_manager::service::ViewManagerInitServiceImpl>(); 37 context_.ConfigureIncomingConnection(connection);
38 connection->AddService<view_manager::service::ViewManagerInitServiceImpl>(
39 &context_);
38 return true; 40 return true;
39 } 41 }
40 42
41 } // namespace shell 43 } // namespace shell
42 } // namespace mojo 44 } // namespace mojo
OLDNEW
« mojo/services/view_manager/view_manager_service_impl.h ('K') | « mojo/shell/view_manager_loader.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698