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

Unified Diff: mojo/examples/surfaces_app/surfaces_app.cc

Issue 668483002: Change mojo URLs from mojo://mojo_foo to mojo://foo. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 2 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: mojo/examples/surfaces_app/surfaces_app.cc
diff --git a/mojo/examples/surfaces_app/surfaces_app.cc b/mojo/examples/surfaces_app/surfaces_app.cc
index 0776e011961afbe7fcdb37e2229743a1babbfbf7..307c20c274e8cbda484e51aa35d080c18c6e4678 100644
--- a/mojo/examples/surfaces_app/surfaces_app.cc
+++ b/mojo/examples/surfaces_app/surfaces_app.cc
@@ -36,12 +36,10 @@ class SurfacesApp : public ApplicationDelegate,
// ApplicationDelegate implementation
virtual bool ConfigureIncomingConnection(
ApplicationConnection* connection) override {
- connection->ConnectToService("mojo:mojo_native_viewport_service",
- &viewport_);
+ connection->ConnectToService("mojo:native_viewport_service", &viewport_);
viewport_.set_client(this);
- connection->ConnectToService("mojo:mojo_surfaces_service",
- &surfaces_service_);
+ connection->ConnectToService("mojo:surfaces_service", &surfaces_service_);
surfaces_service_->CreateSurfaceConnection(base::Bind(
&SurfacesApp::SurfaceConnectionCreated, base::Unretained(this)));
@@ -53,9 +51,8 @@ class SurfacesApp : public ApplicationDelegate,
viewport_->Show();
child_size_ = gfx::Size(size_.width() / 3, size_.height() / 2);
- connection->ConnectToService("mojo:mojo_surfaces_child_app", &child_one_);
- connection->ConnectToService("mojo:mojo_surfaces_child_gl_app",
- &child_two_);
+ connection->ConnectToService("mojo:surfaces_child_app", &child_one_);
+ connection->ConnectToService("mojo:surfaces_child_gl_app", &child_two_);
child_one_->ProduceFrame(Color::From(SK_ColorBLUE),
Size::From(child_size_),
base::Bind(&SurfacesApp::ChildOneProducedFrame,

Powered by Google App Engine
This is Rietveld 408576698