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

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

Issue 423963004: First cut at "content handling" support in Mojo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make the tests pass Created 6 years, 4 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
11 namespace mojo { 11 namespace mojo {
12 12
13 using service::ViewManagerInitServiceImpl; 13 using service::ViewManagerInitServiceImpl;
14 14
15 namespace shell { 15 namespace shell {
16 16
17 ViewManagerLoader::ViewManagerLoader() { 17 ViewManagerLoader::ViewManagerLoader() {
18 } 18 }
19 19
20 ViewManagerLoader::~ViewManagerLoader() { 20 ViewManagerLoader::~ViewManagerLoader() {
21 } 21 }
22 22
23 void ViewManagerLoader::LoadService( 23 void ViewManagerLoader::LoadService(
24 ServiceManager* manager, 24 ServiceManager* manager,
25 const GURL& url, 25 const GURL& url,
26 ScopedMessagePipeHandle shell_handle) { 26 scoped_refptr<LoadServiceCallbacks> callbacks) {
27 ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication();
28 if (!shell_handle.is_valid())
29 return;
30
27 // TODO(sky): this needs some sort of authentication as well as making sure 31 // TODO(sky): this needs some sort of authentication as well as making sure
28 // we only ever have one active at a time. 32 // we only ever have one active at a time.
29 scoped_ptr<ApplicationImpl> app( 33 scoped_ptr<ApplicationImpl> app(
30 new ApplicationImpl(this, shell_handle.Pass())); 34 new ApplicationImpl(this, shell_handle.Pass()));
31 apps_.push_back(app.release()); 35 apps_.push_back(app.release());
32 } 36 }
33 37
34 void ViewManagerLoader::OnServiceError(ServiceManager* manager, 38 void ViewManagerLoader::OnServiceError(ServiceManager* manager,
35 const GURL& url) { 39 const GURL& url) {
36 } 40 }
37 41
38 bool ViewManagerLoader::ConfigureIncomingConnection( 42 bool ViewManagerLoader::ConfigureIncomingConnection(
39 ApplicationConnection* connection) { 43 ApplicationConnection* connection) {
40 context_.ConfigureIncomingConnection(connection); 44 context_.ConfigureIncomingConnection(connection);
41 connection->AddService(this); 45 connection->AddService(this);
42 return true; 46 return true;
43 } 47 }
44 48
45 void ViewManagerLoader::Create( 49 void ViewManagerLoader::Create(
46 ApplicationConnection* connection, 50 ApplicationConnection* connection,
47 InterfaceRequest<ViewManagerInitService> request) { 51 InterfaceRequest<ViewManagerInitService> request) {
48 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_), 52 BindToRequest(new ViewManagerInitServiceImpl(connection, &context_),
49 &request); 53 &request);
50 } 54 }
51 55
52 } // namespace shell 56 } // namespace shell
53 } // namespace mojo 57 } // namespace mojo
OLDNEW
« mojo/shell/dynamic_service_loader_unittest.cc ('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