diff options
author | sky <sky@chromium.org> | 2014-10-06 11:55:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-06 18:55:48 +0000 |
commit | dafebe67bfde1d352b552016db93d089d6693799 (patch) | |
tree | b536ae811aa792671ccbf7198c26d6c1121fa40a /mojo/examples | |
parent | ef044b5b099eb06d5fd0557dda25be846d23b272 (diff) | |
download | chromium_src-dafebe67bfde1d352b552016db93d089d6693799.zip chromium_src-dafebe67bfde1d352b552016db93d089d6693799.tar.gz chromium_src-dafebe67bfde1d352b552016db93d089d6693799.tar.bz2 |
Rename Get to GetProxy
mojo::Get() is too easy to conflict with.
BUG=none
TEST=none
R=davemoore@chromium.org
TBR=keybuk@chromium.org
Review URL: https://codereview.chromium.org/629523003
Cr-Commit-Position: refs/heads/master@{#298288}
Diffstat (limited to 'mojo/examples')
-rw-r--r-- | mojo/examples/compositor_app/compositor_app.cc | 2 | ||||
-rw-r--r-- | mojo/examples/pepper_container_app/pepper_container_app.cc | 2 | ||||
-rw-r--r-- | mojo/examples/sample_app/sample_app.cc | 2 | ||||
-rw-r--r-- | mojo/examples/surfaces_app/child_gl_app.cc | 2 | ||||
-rw-r--r-- | mojo/examples/wget/wget.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 279fe75..516edbb 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -56,7 +56,7 @@ class SampleApp : public ApplicationDelegate, public NativeViewportClient { CommandBufferPtr cb; // TODO(jamesr): Output to a surface instead. gpu_service_->CreateOnscreenGLES2Context( - native_viewport_id, Size::From(gfx::Size(800, 600)), Get(&cb)); + native_viewport_id, Size::From(gfx::Size(800, 600)), GetProxy(&cb)); host_.reset(new CompositorHost(cb.PassMessagePipe())); } diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index 4b64441..82c35f0 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -92,7 +92,7 @@ class PepperContainerApp: public ApplicationDelegate, size->width = 600; // TODO(jamesr): Output a surface to the native viewport instead. gpu_service_->CreateOnscreenGLES2Context( - native_viewport_id_, size.Pass(), Get(&command_buffer)); + native_viewport_id_, size.Pass(), GetProxy(&command_buffer)); return command_buffer.PassMessagePipe(); } diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc index 6ffdb59..ca60ee0 100644 --- a/mojo/examples/sample_app/sample_app.cc +++ b/mojo/examples/sample_app/sample_app.cc @@ -71,7 +71,7 @@ class SampleApp : public mojo::ApplicationDelegate, mojo::CommandBufferPtr command_buffer; // TODO(jamesr): Output to a surface instead. gpu_service_->CreateOnscreenGLES2Context( - native_viewport_id, size.Pass(), Get(&command_buffer)); + native_viewport_id, size.Pass(), GetProxy(&command_buffer)); gles2_client_.reset(new GLES2ClientImpl(command_buffer.Pass())); } diff --git a/mojo/examples/surfaces_app/child_gl_app.cc b/mojo/examples/surfaces_app/child_gl_app.cc index 9646db4..b84826b 100644 --- a/mojo/examples/surfaces_app/child_gl_app.cc +++ b/mojo/examples/surfaces_app/child_gl_app.cc @@ -39,7 +39,7 @@ class ChildGLApp : public ApplicationDelegate, public InterfaceFactory<Child> { virtual void Create(ApplicationConnection* connection, InterfaceRequest<Child> request) override { CommandBufferPtr command_buffer; - gpu_service_->CreateOffscreenGLES2Context(Get(&command_buffer)); + gpu_service_->CreateOffscreenGLES2Context(GetProxy(&command_buffer)); BindToRequest( new ChildGLImpl(surfaces_service_connection_, command_buffer.Pass()), &request); diff --git a/mojo/examples/wget/wget.cc b/mojo/examples/wget/wget.cc index f7c03bb..09c4f7b 100644 --- a/mojo/examples/wget/wget.cc +++ b/mojo/examples/wget/wget.cc @@ -80,7 +80,7 @@ class WGetApp : public ApplicationDelegate { std::string url((args.size() > 1) ? args[1].get() : PromptForURL()); printf("Loading: %s\n", url.c_str()); - network_service_->CreateURLLoader(Get(&url_loader_)); + network_service_->CreateURLLoader(GetProxy(&url_loader_)); URLRequestPtr request(URLRequest::New()); request->url = url; |