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/shell | |
| 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/shell')
| -rw-r--r-- | mojo/shell/android/mojo_main.cc | 4 | ||||
| -rw-r--r-- | mojo/shell/dynamic_service_loader.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mojo/shell/android/mojo_main.cc b/mojo/shell/android/mojo_main.cc index 55fa8111..8419d30 100644 --- a/mojo/shell/android/mojo_main.cc +++ b/mojo/shell/android/mojo_main.cc @@ -10,6 +10,7 @@ #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "jni/MojoMain_jni.h" #include "mojo/public/shell/application.h" @@ -41,8 +42,7 @@ class NativeViewportServiceLoader : public ServiceLoader { private: virtual void LoadService(ServiceManager* manager, const GURL& url, - ScopedShellHandle service_handle) - MOJO_OVERRIDE { + ScopedShellHandle service_handle) OVERRIDE { app_.reset(CreateNativeViewportService(g_context.Get().get(), service_handle.Pass())); } diff --git a/mojo/shell/dynamic_service_loader.h b/mojo/shell/dynamic_service_loader.h index 5331ae0..a954ba5 100644 --- a/mojo/shell/dynamic_service_loader.h +++ b/mojo/shell/dynamic_service_loader.h @@ -35,7 +35,7 @@ class DynamicServiceLoader : public ServiceLoader { // host / port. virtual void LoadService(ServiceManager* manager, const GURL& url, - ScopedShellHandle service_handle) MOJO_OVERRIDE; + ScopedShellHandle service_handle) OVERRIDE; private: class LoadContext; |