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

Side by Side 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, 2 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 unified diff | Download patch
« no previous file with comments | « no previous file | mojo/aura/context_factory_mojo.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ 5 #ifndef MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
6 #define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ 6 #define MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
7 7
8 #include "base/macros.h"
8 #include "ui/compositor/compositor.h" 9 #include "ui/compositor/compositor.h"
9 10
10 namespace mojo { 11 namespace mojo {
11 12
12 class ContextFactoryMojo : public ui::ContextFactory { 13 class ContextFactoryMojo : public ui::ContextFactory {
13 public: 14 public:
14 ContextFactoryMojo(); 15 ContextFactoryMojo();
15 virtual ~ContextFactoryMojo(); 16 virtual ~ContextFactoryMojo();
16 17
17 private: 18 private:
18 // ContextFactory: 19 // ContextFactory:
19 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface( 20 virtual scoped_ptr<cc::OutputSurface> CreateOutputSurface(
20 ui::Compositor* compositor, 21 ui::Compositor* compositor,
21 bool software_fallback) OVERRIDE; 22 bool software_fallback) override;
22 virtual scoped_refptr<ui::Reflector> CreateReflector( 23 virtual scoped_refptr<ui::Reflector> CreateReflector(
23 ui::Compositor* mirrored_compositor, 24 ui::Compositor* mirrored_compositor,
24 ui::Layer* mirroring_layer) OVERRIDE; 25 ui::Layer* mirroring_layer) override;
25 virtual void RemoveReflector(scoped_refptr<ui::Reflector> reflector) OVERRIDE; 26 virtual void RemoveReflector(scoped_refptr<ui::Reflector> reflector) override;
26 virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider() 27 virtual scoped_refptr<cc::ContextProvider> SharedMainThreadContextProvider()
27 OVERRIDE; 28 override;
28 virtual void RemoveCompositor(ui::Compositor* compositor) OVERRIDE; 29 virtual void RemoveCompositor(ui::Compositor* compositor) override;
29 virtual bool DoesCreateTestContexts() OVERRIDE; 30 virtual bool DoesCreateTestContexts() override;
30 virtual cc::SharedBitmapManager* GetSharedBitmapManager() OVERRIDE; 31 virtual cc::SharedBitmapManager* GetSharedBitmapManager() override;
31 virtual base::MessageLoopProxy* GetCompositorMessageLoop() OVERRIDE; 32 virtual base::MessageLoopProxy* GetCompositorMessageLoop() override;
32 33
33 scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_; 34 scoped_ptr<cc::SharedBitmapManager> shared_bitmap_manager_;
34 35
35 DISALLOW_COPY_AND_ASSIGN(ContextFactoryMojo); 36 DISALLOW_COPY_AND_ASSIGN(ContextFactoryMojo);
36 }; 37 };
37 38
38 } // namespace mojo 39 } // namespace mojo
39 40
40 #endif // MOJO_AURA_CONTEXT_FACTORY_MOJO_H_ 41 #endif // MOJO_AURA_CONTEXT_FACTORY_MOJO_H_
OLDNEW
« 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