| Index: services/native_viewport/app_delegate.cc
|
| diff --git a/services/native_viewport/app_delegate.cc b/services/native_viewport/app_delegate.cc
|
| index 38ee4032bcc9c87fd549e16bfb9dbfcd78b90850..67e5ecb9afd180eefb3ada28ba30f4b1ab8d3768 100644
|
| --- a/services/native_viewport/app_delegate.cc
|
| +++ b/services/native_viewport/app_delegate.cc
|
| @@ -59,23 +59,24 @@ void NativeViewportAppDelegate::Initialize(mojo::ApplicationImpl* application) {
|
| }
|
|
|
| bool NativeViewportAppDelegate::ConfigureIncomingConnection(
|
| - ApplicationConnection* connection) {
|
| - connection->AddService<NativeViewport>(this);
|
| - connection->AddService<Gpu>(this);
|
| + mojo::ApplicationConnection* connection) {
|
| + connection->AddService<mojo::NativeViewport>(this);
|
| + connection->AddService<mojo::Gpu>(this);
|
| return true;
|
| }
|
|
|
| void NativeViewportAppDelegate::Create(
|
| - ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<NativeViewport> request) {
|
| + const mojo::ConnectionContext& connection_context,
|
| + mojo::InterfaceRequest<mojo::NativeViewport> request) {
|
| if (!gpu_state_.get())
|
| gpu_state_ = new gles2::GpuState;
|
| new NativeViewportImpl(application_, is_headless_, gpu_state_,
|
| request.Pass());
|
| }
|
|
|
| -void NativeViewportAppDelegate::Create(ApplicationConnection* connection,
|
| - mojo::InterfaceRequest<Gpu> request) {
|
| +void NativeViewportAppDelegate::Create(
|
| + const mojo::ConnectionContext& connection_context,
|
| + mojo::InterfaceRequest<mojo::Gpu> request) {
|
| if (!gpu_state_.get())
|
| gpu_state_ = new gles2::GpuState;
|
| new gles2::GpuImpl(request.Pass(), gpu_state_);
|
|
|