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

Unified Diff: mojo/aura/context_factory_mojo.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 | « no previous file | mojo/aura/context_factory_mojo.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/aura/context_factory_mojo.h
diff --git a/mojo/aura/context_factory_mojo.h b/mojo/aura/context_factory_mojo.h
index 800afa7bd6d458480f80980816f70d49cca56e56..437359dd4d894cf5fd207063ee8cf2775a1f4abc 100644
--- a/mojo/aura/context_factory_mojo.h
+++ b/mojo/aura/context_factory_mojo.h
@@ -5,6 +5,7 @@
#ifndef MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
#define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
+#include "base/macros.h"
#include "ui/compositor/compositor.h"
namespace mojo {
@@ -18,17 +19,17 @@ class ContextFactoryMojo : public ui::ContextFactory {
// ContextFactory:
virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
ui::Compositor* compositor,
- bool software_fallback) OVERRIDE;
+ bool software_fallback) override;
virtual scoped_refptr<ui::Reflector> CreateReflector(
ui::Compositor* mirrored_compositor,
- ui::Layer* mirroring_layer) OVERRIDE;
- virtual void RemoveReflector(scoped_refptr<ui::Reflector> reflector) OVERRIDE;
+ ui::Layer* mirroring_layer) override;
+ virtual void RemoveReflector(scoped_refptr<ui::Reflector> reflector) override;
virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider()
- OVERRIDE;
- virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE;
- virtual bool DoesCreateTestContexts() OVERRIDE;
- virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE;
- virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE;
+ override;
+ virtual void RemoveCompositor(ui::Compositor* compositor) override;
+ virtual bool DoesCreateTestContexts() override;
+ virtual cc::SharedBitmapManager* GetSharedBitmapManager() override;
+ virtual base::MessageLoopProxy* GetCompositorMessageLoop() override;
scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_;
« no previous file with comments | « no previous file | mojo/aura/context_factory_mojo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698