| Index: shell/android/native_viewport_application_loader.cc
|
| diff --git a/shell/android/native_viewport_application_loader.cc b/shell/android/native_viewport_application_loader.cc
|
| index 82d0ca26be48a84c1007d62294aab85d3313a6c5..295fce6cc1cc200c4769263929737108283a55c5 100644
|
| --- a/shell/android/native_viewport_application_loader.cc
|
| +++ b/shell/android/native_viewport_application_loader.cc
|
| @@ -9,6 +9,9 @@
|
| #include "services/native_viewport/native_viewport_impl.h"
|
| #include "shell/android/keyboard_impl.h"
|
|
|
| +using mojo::ApplicationConnection;
|
| +using mojo::InterfaceRequest;
|
| +
|
| namespace shell {
|
|
|
| NativeViewportApplicationLoader::NativeViewportApplicationLoader() {
|
| @@ -19,13 +22,13 @@ NativeViewportApplicationLoader::~NativeViewportApplicationLoader() {
|
|
|
| void NativeViewportApplicationLoader::Load(
|
| const GURL& url,
|
| - mojo::InterfaceRequest<mojo::Application> application_request) {
|
| + InterfaceRequest<mojo::Application> application_request) {
|
| DCHECK(application_request.is_pending());
|
| app_.reset(new mojo::ApplicationImpl(this, application_request.Pass()));
|
| }
|
|
|
| bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
|
| - mojo::ApplicationConnection* connection) {
|
| + ApplicationConnection* connection) {
|
| connection->AddService<mojo::NativeViewport>(this);
|
| connection->AddService<mojo::Gpu>(this);
|
| connection->AddService<mojo::Keyboard>(this);
|
| @@ -33,22 +36,22 @@ bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
|
| }
|
|
|
| void NativeViewportApplicationLoader::Create(
|
| - mojo::ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<mojo::NativeViewport> request) {
|
| + ApplicationConnection* connection,
|
| + InterfaceRequest<mojo::NativeViewport> request) {
|
| if (!gpu_state_)
|
| gpu_state_ = new gles2::GpuState;
|
| new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
|
| }
|
|
|
| void NativeViewportApplicationLoader::Create(
|
| - mojo::ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<mojo::Keyboard> request) {
|
| + ApplicationConnection* connection,
|
| + InterfaceRequest<mojo::Keyboard> request) {
|
| new KeyboardImpl(request.Pass());
|
| }
|
|
|
| void NativeViewportApplicationLoader::Create(
|
| - mojo::ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<mojo::Gpu> request) {
|
| + ApplicationConnection* connection,
|
| + InterfaceRequest<mojo::Gpu> request) {
|
| if (!gpu_state_)
|
| gpu_state_ = new gles2::GpuState;
|
| new gles2::GpuImpl(request.Pass(), gpu_state_);
|
|
|