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

Unified 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 side-by-side diff with in-line comments
Download patch
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 0d8df78cc1b4c2af7a50e7b242f2a4d1ecda3560..82d0ca26be48a84c1007d62294aab85d3313a6c5 100644
--- a/shell/android/native_viewport_application_loader.cc
+++ b/shell/android/native_viewport_application_loader.cc
@@ -9,7 +9,6 @@
#include "services/native_viewport/native_viewport_impl.h"
#include "shell/android/keyboard_impl.h"
-namespace mojo {
namespace shell {
NativeViewportApplicationLoader::NativeViewportApplicationLoader() {
@@ -20,39 +19,39 @@ NativeViewportApplicationLoader::~NativeViewportApplicationLoader() {
void NativeViewportApplicationLoader::Load(
const GURL& url,
- InterfaceRequest<Application> application_request) {
+ mojo::InterfaceRequest<mojo::Application> application_request) {
DCHECK(application_request.is_pending());
- app_.reset(new ApplicationImpl(this, application_request.Pass()));
+ app_.reset(new mojo::ApplicationImpl(this, application_request.Pass()));
}
bool NativeViewportApplicationLoader::ConfigureIncomingConnection(
- ApplicationConnection* connection) {
- connection->AddService<NativeViewport>(this);
- connection->AddService<Gpu>(this);
- connection->AddService<Keyboard>(this);
+ mojo::ApplicationConnection* connection) {
+ connection->AddService<mojo::NativeViewport>(this);
+ connection->AddService<mojo::Gpu>(this);
+ connection->AddService<mojo::Keyboard>(this);
return true;
}
void NativeViewportApplicationLoader::Create(
- ApplicationConnection* connection,
- InterfaceRequest<NativeViewport> request) {
+ mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<mojo::NativeViewport> request) {
if (!gpu_state_)
gpu_state_ = new gles2::GpuState;
new native_viewport::NativeViewportImpl(false, gpu_state_, request.Pass());
}
void NativeViewportApplicationLoader::Create(
- ApplicationConnection* connection,
- InterfaceRequest<Keyboard> request) {
+ mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<mojo::Keyboard> request) {
new KeyboardImpl(request.Pass());
}
-void NativeViewportApplicationLoader::Create(ApplicationConnection* connection,
- InterfaceRequest<Gpu> request) {
+void NativeViewportApplicationLoader::Create(
+ mojo::ApplicationConnection* connection,
+ mojo::InterfaceRequest<mojo::Gpu> request) {
if (!gpu_state_)
gpu_state_ = new gles2::GpuState;
new gles2::GpuImpl(request.Pass(), gpu_state_);
}
} // namespace shell
-} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698