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

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

Issue 413353002: Remove extraneous namespaces (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Review nits and merge Created 6 years, 5 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 | Annotate | Revision Log
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 "cc/surfaces/surface_manager.h" 9 #include "cc/surfaces/surface_manager.h"
10 #include "mojo/public/cpp/application/application_delegate.h" 10 #include "mojo/public/cpp/application/application_delegate.h"
11 #include "mojo/services/surfaces/surfaces_impl.h" 11 #include "mojo/services/surfaces/surfaces_impl.h"
12 12
13 namespace mojo { 13 namespace mojo {
14 class ApplicationConnection; 14 class ApplicationConnection;
15 15
16 namespace surfaces {
17
18 class SurfacesServiceApplication : public ApplicationDelegate, 16 class SurfacesServiceApplication : public ApplicationDelegate,
19 public InterfaceFactory<Surface>, 17 public InterfaceFactory<Surface>,
20 public SurfacesImpl::Client { 18 public SurfacesImpl::Client {
21 public: 19 public:
22 SurfacesServiceApplication(); 20 SurfacesServiceApplication();
23 virtual ~SurfacesServiceApplication(); 21 virtual ~SurfacesServiceApplication();
24 22
25 // ApplicationDelegate implementation. 23 // ApplicationDelegate implementation.
26 virtual bool ConfigureIncomingConnection( 24 virtual bool ConfigureIncomingConnection(
27 ApplicationConnection* connection) OVERRIDE; 25 ApplicationConnection* connection) OVERRIDE;
28 26
29 // InterfaceFactory<Surface> implementation. 27 // InterfaceFactory<Surface> implementation.
30 virtual void Create(ApplicationConnection* connection, 28 virtual void Create(ApplicationConnection* connection,
31 InterfaceRequest<Surface> request) OVERRIDE; 29 InterfaceRequest<Surface> request) OVERRIDE;
32 30
33 // SurfacesImpl::Client implementation. 31 // SurfacesImpl::Client implementation.
34 virtual void FrameSubmitted() OVERRIDE; 32 virtual void FrameSubmitted() OVERRIDE;
35 virtual void SetDisplay(cc::Display*) OVERRIDE; 33 virtual void SetDisplay(cc::Display*) OVERRIDE;
36 34
37 private: 35 private:
38 cc::SurfaceManager manager_; 36 cc::SurfaceManager manager_;
39 uint32_t next_id_namespace_; 37 uint32_t next_id_namespace_;
40 cc::Display* display_; 38 cc::Display* display_;
41 39
42 DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication); 40 DISALLOW_COPY_AND_ASSIGN(SurfacesServiceApplication);
43 }; 41 };
44 42
45 } // namespace surfaces
46 } // namespace mojo 43 } // namespace mojo
47 44
48 #endif // MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_ 45 #endif // MOJO_SERVICES_SURFACES_SURFACES_SERVICE_APPLICATION_H_
OLDNEW
« no previous file with comments | « mojo/services/surfaces/surfaces_impl.cc ('k') | mojo/services/surfaces/surfaces_service_application.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698