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

Side by Side Diff: mojo/shell/view_manager_loader.cc

Issue 308803002: Change type of interface created by mojo:view_manager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanup Created 6 years, 6 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.h" 7 #include "mojo/public/cpp/application/application.h"
8 #include "mojo/services/view_manager/root_node_manager.h" 8 #include "mojo/services/view_manager/view_manager_init_connection.h"
9 #include "mojo/services/view_manager/view_manager_connection.h"
10 9
11 namespace mojo { 10 namespace mojo {
12 namespace shell { 11 namespace shell {
13 12
14 ViewManagerLoader::ViewManagerLoader() { 13 ViewManagerLoader::ViewManagerLoader() {
15 } 14 }
16 15
17 ViewManagerLoader::~ViewManagerLoader() { 16 ViewManagerLoader::~ViewManagerLoader() {
18 } 17 }
19 18
20 void ViewManagerLoader::LoadService( 19 void ViewManagerLoader::LoadService(
21 ServiceManager* manager, 20 ServiceManager* manager,
22 const GURL& url, 21 const GURL& url,
23 ScopedMessagePipeHandle service_provider_handle) { 22 ScopedMessagePipeHandle service_provider_handle) {
23 // TODO(sky): this needs some sort of authentication as well as making sure
24 // we only ever have one active at a time.
24 scoped_ptr<Application> app(new Application(service_provider_handle.Pass())); 25 scoped_ptr<Application> app(new Application(service_provider_handle.Pass()));
25 if (!root_node_manager_.get()) { 26 app->AddService<view_manager::service::ViewManagerInitConnection>(
26 root_node_manager_.reset( 27 app->service_provider());
27 new view_manager::service::RootNodeManager(app->service_provider()));
28 }
29 app->AddService<view_manager::service::ViewManagerConnection>(
30 root_node_manager_.get());
31 apps_.push_back(app.release()); 28 apps_.push_back(app.release());
32 } 29 }
33 30
34 void ViewManagerLoader::OnServiceError(ServiceManager* manager, 31 void ViewManagerLoader::OnServiceError(ServiceManager* manager,
35 const GURL& url) { 32 const GURL& url) {
36 } 33 }
37 34
38 } // namespace shell 35 } // namespace shell
39 } // namespace mojo 36 } // 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