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

Side by Side Diff: shell/android/native_viewport_application_loader.cc

Issue 1067173003: Remove mojo:: part of mojo::shell:: nested namespace in //shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 8 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
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 "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/gles2/gpu_state.h" 8 #include "services/gles2/gpu_state.h"
9 #include "services/native_viewport/native_viewport_impl.h" 9 #include "services/native_viewport/native_viewport_impl.h"
10 #include "shell/android/keyboard_impl.h" 10 #include "shell/android/keyboard_impl.h"
11 11
12 namespace mojo {
13 namespace shell { 12 namespace shell {
14 13
15 NativeViewportApplicationLoader::NativeViewportApplicationLoader() { 14 NativeViewportApplicationLoader::NativeViewportApplicationLoader() {
16 } 15 }
17 16
18 NativeViewportApplicationLoader::~NativeViewportApplicationLoader() { 17 NativeViewportApplicationLoader::~NativeViewportApplicationLoader() {
19 } 18 }
20 19
21 void NativeViewportApplicationLoader::Load( 20 void NativeViewportApplicationLoader::Load(
22 const GURL& url, 21 const GURL& url,
23 InterfaceRequest<Application> application_request) { 22 mojo::InterfaceRequest<mojo::Application> application_request) {
24 DCHECK(application_request.is_pending()); 23 DCHECK(application_request.is_pending());
25 app_.reset(new ApplicationImpl(this, application_request.Pass())); 24 app_.reset(new mojo::ApplicationImpl(this, application_request.Pass()));
26 } 25 }
27 26
28 bool NativeViewportApplicationLoader::ConfigureIncomingConnection( 27 bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
29 ApplicationConnection* connection) { 28 mojo::ApplicationConnection* connection) {
30 connection->AddService<NativeViewport>(this); 29 connection->AddService<mojo::NativeViewport>(this);
31 connection->AddService<Gpu>(this); 30 connection->AddService<mojo::Gpu>(this);
32 connection->AddService<Keyboard>(this); 31 connection->AddService<mojo::Keyboard>(this);
33 return true; 32 return true;
34 } 33 }
35 34
36 void NativeViewportApplicationLoader::Create( 35 void NativeViewportApplicationLoader::Create(
37 ApplicationConnection* connection, 36 mojo::ApplicationConnection* connection,
38 InterfaceRequest<NativeViewport> request) { 37 mojo::InterfaceRequest<mojo::NativeViewport> request) {
39 if (!gpu_state_) 38 if (!gpu_state_)
40 gpu_state_ = new gles2::GpuState; 39 gpu_state_ = new gles2::GpuState;
41 new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass()); 40 new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
42 } 41 }
43 42
44 void NativeViewportApplicationLoader::Create( 43 void NativeViewportApplicationLoader::Create(
45 ApplicationConnection* connection, 44 mojo::ApplicationConnection* connection,
46 InterfaceRequest<Keyboard> request) { 45 mojo::InterfaceRequest<mojo::Keyboard> request) {
47 new KeyboardImpl(request.Pass()); 46 new KeyboardImpl(request.Pass());
48 } 47 }
49 48
50 void NativeViewportApplicationLoader::Create(ApplicationConnection* connection, 49 void NativeViewportApplicationLoader::Create(
51 InterfaceRequest<Gpu> request) { 50 mojo::ApplicationConnection* connection,
51 mojo::InterfaceRequest<mojo::Gpu> request) {
52 if (!gpu_state_) 52 if (!gpu_state_)
53 gpu_state_ = new gles2::GpuState; 53 gpu_state_ = new gles2::GpuState;
54 new gles2::GpuImpl(request.Pass(), gpu_state_); 54 new gles2::GpuImpl(request.Pass(), gpu_state_);
55 } 55 }
56 56
57 } // namespace shell 57 } // namespace shell
58 } // namespace mojo
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698