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

Unified Diff: mojo/services/native_viewport/native_viewport_impl.h

Issue 623573002: Mojo: Convert the remaining OVERRIDEs to override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « mojo/services/native_viewport/main.cc ('k') | mojo/services/native_viewport/platform_viewport_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/services/native_viewport/native_viewport_impl.h
diff --git a/mojo/services/native_viewport/native_viewport_impl.h b/mojo/services/native_viewport/native_viewport_impl.h
index ad8e5c48c8d0ef9b5ad0314d1b78f008fec1311e..03918cb7b43e57965dc1ee3b840778c282fbf52d 100644
--- a/mojo/services/native_viewport/native_viewport_impl.h
+++ b/mojo/services/native_viewport/native_viewport_impl.h
@@ -5,6 +5,7 @@
#ifndef MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_
#define MOJO_SERVICES_NATIVE_VIEWPORT_IMPL_H_
+#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "cc/surfaces/surface_id.h"
#include "mojo/services/native_viewport/platform_viewport.h"
@@ -29,19 +30,19 @@ class NativeViewportImpl : public InterfaceImpl<NativeViewport>,
// InterfaceImpl<NativeViewport> implementation.
virtual void Create(SizePtr size,
- const Callback<void(uint64_t)>& callback) OVERRIDE;
- virtual void Show() OVERRIDE;
- virtual void Hide() OVERRIDE;
- virtual void Close() OVERRIDE;
- virtual void SetSize(SizePtr size) OVERRIDE;
- virtual void SubmittedFrame(SurfaceIdPtr surface_id) OVERRIDE;
+ const Callback<void(uint64_t)>& callback) override;
+ virtual void Show() override;
+ virtual void Hide() override;
+ virtual void Close() override;
+ virtual void SetSize(SizePtr size) override;
+ virtual void SubmittedFrame(SurfaceIdPtr surface_id) override;
// PlatformViewport::Delegate implementation.
- virtual void OnBoundsChanged(const gfx::Rect& bounds) OVERRIDE;
+ virtual void OnBoundsChanged(const gfx::Rect& bounds) override;
virtual void OnAcceleratedWidgetAvailable(
- gfx::AcceleratedWidget widget) OVERRIDE;
- virtual bool OnEvent(ui::Event* ui_event) OVERRIDE;
- virtual void OnDestroyed() OVERRIDE;
+ gfx::AcceleratedWidget widget) override;
+ virtual bool OnEvent(ui::Event* ui_event) override;
+ virtual void OnDestroyed() override;
void AckEvent();
« no previous file with comments | « mojo/services/native_viewport/main.cc ('k') | mojo/services/native_viewport/platform_viewport_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698