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

Side by Side Diff: mojo/services/surfaces/surfaces_service_application.h

Issue 634483003: replace OVERRIDE and FINAL with override and final in mojo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove compiler_specific.h inclusions 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 | « mojo/services/surfaces/surfaces_impl.h ('k') | mojo/services/surfaces/surfaces_service_impl.h » ('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_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ 5 #ifndef MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
6 #define MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ 6 #define MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/timer/timer.h" 9 #include "base/timer/timer.h"
10 #include "cc/surfaces/surface_manager.h" 10 #include "cc/surfaces/surface_manager.h"
11 #include "mojo/public/cpp/application/application_delegate.h" 11 #include "mojo/public/cpp/application/application_delegate.h"
12 #include "mojo/public/cpp/application/interface_factory.h" 12 #include "mojo/public/cpp/application/interface_factory.h"
13 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h" 13 #include "mojo/services/public/interfaces/surfaces/surfaces_service.mojom.h"
14 #include "mojo/services/surfaces/surfaces_impl.h" 14 #include "mojo/services/surfaces/surfaces_impl.h"
15 15
16 namespace mojo { 16 namespace mojo {
17 class ApplicationConnection; 17 class ApplicationConnection;
18 18
19 class SurfacesServiceApplication : public ApplicationDelegate, 19 class SurfacesServiceApplication : public ApplicationDelegate,
20 public InterfaceFactory<SurfacesService>, 20 public InterfaceFactory<SurfacesService>,
21 public SurfacesImpl::Client { 21 public SurfacesImpl::Client {
22 public: 22 public:
23 SurfacesServiceApplication(); 23 SurfacesServiceApplication();
24 virtual ~SurfacesServiceApplication(); 24 virtual ~SurfacesServiceApplication();
25 25
26 // ApplicationDelegate implementation. 26 // ApplicationDelegate implementation.
27 virtual bool ConfigureIncomingConnection( 27 virtual bool ConfigureIncomingConnection(
28 ApplicationConnection* connection) OVERRIDE; 28 ApplicationConnection* connection) override;
29 29
30 // InterfaceFactory<SurfacsServicee> implementation. 30 // InterfaceFactory<SurfacsServicee> implementation.
31 virtual void Create(ApplicationConnection* connection, 31 virtual void Create(ApplicationConnection* connection,
32 InterfaceRequest<SurfacesService> request) OVERRIDE; 32 InterfaceRequest<SurfacesService> request) override;
33 33
34 // SurfacesImpl::Client implementation. 34 // SurfacesImpl::Client implementation.
35 virtual void FrameSubmitted() OVERRIDE; 35 virtual void FrameSubmitted() override;
36 virtual void SetDisplay(cc::Display*) OVERRIDE; 36 virtual void SetDisplay(cc::Display*) override;
37 37
38 private: 38 private:
39 cc::SurfaceManager manager_; 39 cc::SurfaceManager manager_;
40 uint32_t next_id_namespace_; 40 uint32_t next_id_namespace_;
41 cc::Display* display_; 41 cc::Display* display_;
42 // TODO(jamesr): Integrate with real scheduler. 42 // TODO(jamesr): Integrate with real scheduler.
43 base::Timer draw_timer_; 43 base::Timer draw_timer_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication); 45 DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication);
46 }; 46 };
47 47
48 } // namespace mojo 48 } // namespace mojo
49 49
50 #endif // MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ 50 #endif // MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
OLDNEW
« no previous file with comments | « mojo/services/surfaces/surfaces_impl.h ('k') | mojo/services/surfaces/surfaces_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698