diff options
author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 17:07:25 +0000 |
---|---|---|
committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-18 17:07:25 +0000 |
commit | e9da2b7913d6af558ecfe79e769c3db966f548e8 (patch) | |
tree | 2f17e911b08d7c411c087c5a53db9d76716cd7a6 /mojo/examples/compositor_app | |
parent | cea159c9938d30c42bbba30bd476496a014419dc (diff) | |
download | chromium_src-e9da2b7913d6af558ecfe79e769c3db966f548e8.zip chromium_src-e9da2b7913d6af558ecfe79e769c3db966f548e8.tar.gz chromium_src-e9da2b7913d6af558ecfe79e769c3db966f548e8.tar.bz2 |
Mojo: Cleanup: MOJO_OVERRIDE -> OVERRIDE in places where we use base/.
(mojo/public/ has MOJO_OVERRIDE, since it can't use base/, but we should
use the regular OVERRIDE where we can use base/.)
R=sky@chromium.org
Review URL: https://codereview.chromium.org/202733002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/compositor_app')
-rw-r--r-- | mojo/examples/compositor_app/compositor_app.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 468ffa5..68e9350 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -5,6 +5,7 @@ #include <stdio.h> #include <string> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "mojo/examples/compositor_app/compositor_host.h" #include "mojo/public/bindings/allocation_scope.h" @@ -51,18 +52,18 @@ class SampleApp : public Application, public NativeViewportClient { host_.reset(new CompositorHost(gles2_handle.Pass())); } - virtual void OnCreated() MOJO_OVERRIDE { + virtual void OnCreated() OVERRIDE { } - virtual void OnDestroyed() MOJO_OVERRIDE { + virtual void OnDestroyed() OVERRIDE { base::MessageLoop::current()->Quit(); } - virtual void OnBoundsChanged(const Rect& bounds) MOJO_OVERRIDE { + virtual void OnBoundsChanged(const Rect& bounds) OVERRIDE { host_->SetSize(bounds.size()); } - virtual void OnEvent(const Event& event) MOJO_OVERRIDE { + virtual void OnEvent(const Event& event) OVERRIDE { if (!event.location().is_null()) { viewport_->AckEvent(event); } |