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 |
11 namespace mojo { | 11 namespace mojo { |
12 namespace shell { | 12 namespace shell { |
13 | 13 |
14 NativeViewportApplicationLoader::NativeViewportApplicationLoader() { | 14 NativeViewportApplicationLoader::NativeViewportApplicationLoader() { |
15 } | 15 } |
16 | 16 |
17 NativeViewportApplicationLoader::~NativeViewportApplicationLoader() { | 17 NativeViewportApplicationLoader::~NativeViewportApplicationLoader() { |
18 } | 18 } |
19 | 19 |
20 void NativeViewportApplicationLoader::Load( | 20 void NativeViewportApplicationLoader::Load( |
21 ApplicationManager* manager, | |
22 const GURL& url, | 21 const GURL& url, |
23 InterfaceRequest<Application> application_request, | 22 InterfaceRequest<Application> application_request) { |
24 LoadCallback callback) { | |
25 DCHECK(application_request.is_pending()); | 23 DCHECK(application_request.is_pending()); |
26 app_.reset(new ApplicationImpl(this, application_request.Pass())); | 24 app_.reset(new ApplicationImpl(this, application_request.Pass())); |
27 } | 25 } |
28 | 26 |
29 void NativeViewportApplicationLoader::OnApplicationError( | 27 void NativeViewportApplicationLoader::OnApplicationError( |
30 ApplicationManager* manager, | 28 ApplicationManager* manager, |
31 const GURL& url) { | 29 const GURL& url) { |
32 } | 30 } |
33 | 31 |
34 bool NativeViewportApplicationLoader::ConfigureIncomingConnection( | 32 bool NativeViewportApplicationLoader::ConfigureIncomingConnection( |
(...skipping 18 matching lines...) Expand all Loading... |
53 | 51 |
54 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection, | 52 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection, |
55 InterfaceRequest<Gpu> request) { | 53 InterfaceRequest<Gpu> request) { |
56 if (!gpu_state_) | 54 if (!gpu_state_) |
57 gpu_state_ = new gles2::GpuImpl::State; | 55 gpu_state_ = new gles2::GpuImpl::State; |
58 new gles2::GpuImpl(request.Pass(), gpu_state_); | 56 new gles2::GpuImpl(request.Pass(), gpu_state_); |
59 } | 57 } |
60 | 58 |
61 } // namespace shell | 59 } // namespace shell |
62 } // namespace mojo | 60 } // namespace mojo |
OLD | NEW |