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

Unified Diff: mojo/services/window_manager/window_manager_app.h

Issue 617503003: Mojo: MOJO_OVERRIDE -> override in mojo/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased 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
Index: mojo/services/window_manager/window_manager_app.h
diff --git a/mojo/services/window_manager/window_manager_app.h b/mojo/services/window_manager/window_manager_app.h
index 153f711f92df970d90eaee91df7a015134fd731b..01221d60212bfd32e91a0835697a4457efece873 100644
--- a/mojo/services/window_manager/window_manager_app.h
+++ b/mojo/services/window_manager/window_manager_app.h
@@ -89,22 +89,20 @@ class WindowManagerApp
void InitFocus(wm::FocusRules* rules);
// Overridden from ApplicationDelegate:
- virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE;
- virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
- MOJO_OVERRIDE;
+ virtual void Initialize(ApplicationImpl* impl) override;
+ virtual bool ConfigureIncomingConnection(
+ ApplicationConnection* connection) override;
private:
typedef std::set<WindowManagerServiceImpl*> Connections;
typedef std::map<Id, aura::Window*> ViewIdToWindowMap;
// Overridden from ViewManagerDelegate:
- virtual void OnEmbed(
- ViewManager* view_manager,
- View* root,
- ServiceProviderImpl* exported_services,
- scoped_ptr<ServiceProvider> imported_services) MOJO_OVERRIDE;
- virtual void OnViewManagerDisconnected(
- ViewManager* view_manager) MOJO_OVERRIDE;
+ virtual void OnEmbed(ViewManager* view_manager,
+ View* root,
+ ServiceProviderImpl* exported_services,
+ scoped_ptr<ServiceProvider> imported_services) override;
+ virtual void OnViewManagerDisconnected(ViewManager* view_manager) override;
// Overridden from WindowManagerDelegate:
virtual void Embed(
@@ -114,25 +112,25 @@ class WindowManagerApp
// Overridden from ViewObserver:
virtual void OnTreeChanged(
- const ViewObserver::TreeChangeParams& params) MOJO_OVERRIDE;
- virtual void OnViewDestroyed(View* view) MOJO_OVERRIDE;
+ const ViewObserver::TreeChangeParams& params) override;
+ virtual void OnViewDestroyed(View* view) override;
virtual void OnViewBoundsChanged(View* view,
const gfx::Rect& old_bounds,
- const gfx::Rect& new_bounds) MOJO_OVERRIDE;
+ const gfx::Rect& new_bounds) override;
// Overridden from WindowTreeHostMojoDelegate:
- virtual void CompositorContentsChanged(const SkBitmap& bitmap) MOJO_OVERRIDE;
+ virtual void CompositorContentsChanged(const SkBitmap& bitmap) override;
// Overridden from ui::EventHandler:
- virtual void OnEvent(ui::Event* event) MOJO_OVERRIDE;
+ virtual void OnEvent(ui::Event* event) override;
// Overridden from aura::client::FocusChangeObserver:
virtual void OnWindowFocused(aura::Window* gained_focus,
- aura::Window* lost_focus) MOJO_OVERRIDE;
+ aura::Window* lost_focus) override;
// Overridden from aura::client::ActivationChangeObserver:
virtual void OnWindowActivated(aura::Window* gained_active,
- aura::Window* lost_active) MOJO_OVERRIDE;
+ aura::Window* lost_active) override;
// Creates an aura::Window for every view in the hierarchy beneath |view|,
// and adds to the registry so that it can be retrieved later via

Powered by Google App Engine
This is Rietveld 408576698