| OLD | NEW |
| 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 "shell/android/native_viewport_application_loader.h" | 5 #include "shell/android/native_viewport_application_loader.h" |
| 6 | 6 |
| 7 #include "mojo/public/cpp/application/application_impl.h" | 7 #include "mojo/public/cpp/application/application_impl.h" |
| 8 #include "services/native_viewport/native_viewport_impl.h" | 8 #include "services/native_viewport/native_viewport_impl.h" |
| 9 #include "shell/android/keyboard_impl.h" | 9 #include "shell/android/keyboard_impl.h" |
| 10 | 10 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 DCHECK(application_request.is_pending()); | 23 DCHECK(application_request.is_pending()); |
| 24 app_.reset(new ApplicationImpl(this, application_request.Pass())); | 24 app_.reset(new ApplicationImpl(this, application_request.Pass())); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void NativeViewportApplicationLoader::OnApplicationError( | 27 void NativeViewportApplicationLoader::OnApplicationError( |
| 28 ApplicationManager* manager, | 28 ApplicationManager* manager, |
| 29 const GURL& url) { | 29 const GURL& url) { |
| 30 } | 30 } |
| 31 | 31 |
| 32 bool NativeViewportApplicationLoader::ConfigureIncomingConnection( | 32 bool NativeViewportApplicationLoader::ConfigureIncomingConnection( |
| 33 mojo::ApplicationConnection* connection) { | 33 mojo::ApplicationConnection* connection, |
| 34 const std::string& url) { |
| 34 connection->AddService<NativeViewport>(this); | 35 connection->AddService<NativeViewport>(this); |
| 35 connection->AddService<Gpu>(this); | 36 connection->AddService<Gpu>(this); |
| 36 connection->AddService<Keyboard>(this); | 37 connection->AddService<Keyboard>(this); |
| 37 return true; | 38 return true; |
| 38 } | 39 } |
| 39 | 40 |
| 40 void NativeViewportApplicationLoader::Create( | 41 void NativeViewportApplicationLoader::Create( |
| 41 ApplicationConnection* connection, | 42 ApplicationConnection* connection, |
| 42 InterfaceRequest<NativeViewport> request) { | 43 InterfaceRequest<NativeViewport> request) { |
| 43 new native_viewport::NativeViewportImpl(app_.get(), false, request.Pass()); | 44 new native_viewport::NativeViewportImpl(app_.get(), false, request.Pass()); |
| 44 } | 45 } |
| 45 | 46 |
| 46 void NativeViewportApplicationLoader::Create( | 47 void NativeViewportApplicationLoader::Create( |
| 47 ApplicationConnection* connection, | 48 ApplicationConnection* connection, |
| 48 InterfaceRequest<Keyboard> request) { | 49 InterfaceRequest<Keyboard> request) { |
| 49 new KeyboardImpl(request.Pass()); | 50 new KeyboardImpl(request.Pass()); |
| 50 } | 51 } |
| 51 | 52 |
| 52 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection, | 53 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection, |
| 53 InterfaceRequest<Gpu> request) { | 54 InterfaceRequest<Gpu> request) { |
| 54 if (!gpu_state_) | 55 if (!gpu_state_) |
| 55 gpu_state_ = new gles2::GpuImpl::State; | 56 gpu_state_ = new gles2::GpuImpl::State; |
| 56 new gles2::GpuImpl(request.Pass(), gpu_state_); | 57 new gles2::GpuImpl(request.Pass(), gpu_state_); |
| 57 } | 58 } |
| 58 | 59 |
| 59 } // namespace shell | 60 } // namespace shell |
| 60 } // namespace mojo | 61 } // namespace mojo |
| OLD | NEW |