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

Side by Side Diff: mojo/services/surfaces/surfaces_impl.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_IMPL_H_ 5 #ifndef MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
6 #define MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_ 6 #define MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "cc/surfaces/display_client.h" 9 #include "cc/surfaces/display_client.h"
10 #include "cc/surfaces/surface_factory.h" 10 #include "cc/surfaces/surface_factory.h"
11 #include "cc/surfaces/surface_factory_client.h" 11 #include "cc/surfaces/surface_factory_client.h"
12 #include "mojo/public/cpp/application/application_connection.h" 12 #include "mojo/public/cpp/application/application_connection.h"
13 #include "mojo/services/gles2/command_buffer.mojom.h" 13 #include "mojo/services/gles2/command_buffer.mojom.h"
14 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h" 14 #include "mojo/services/public/interfaces/surfaces/surfaces.mojom.h"
15 15
16 namespace cc { 16 namespace cc {
17 class Display; 17 class Display;
18 } 18 }
19 19
20 namespace mojo { 20 namespace mojo {
21 class ServiceManager; 21 class ServiceManager;
22 22
23 namespace surfaces {
24
25 class SurfaceNativeViewportClient; 23 class SurfaceNativeViewportClient;
26 24
27 class SurfacesImpl : public InterfaceImpl<Surface>, 25 class SurfacesImpl : public InterfaceImpl<Surface>,
28 public cc::SurfaceFactoryClient, 26 public cc::SurfaceFactoryClient,
29 public cc::DisplayClient { 27 public cc::DisplayClient {
30 public: 28 public:
31 class Client { 29 class Client {
32 public: 30 public:
33 virtual void FrameSubmitted() = 0; 31 virtual void FrameSubmitted() = 0;
34 virtual void SetDisplay(cc::Display*) = 0; 32 virtual void SetDisplay(cc::Display*) = 0;
(...skipping 28 matching lines...) Expand all
63 cc::SurfaceManager* manager_; 61 cc::SurfaceManager* manager_;
64 cc::SurfaceFactory factory_; 62 cc::SurfaceFactory factory_;
65 uint32_t id_namespace_; 63 uint32_t id_namespace_;
66 Client* client_; 64 Client* client_;
67 scoped_ptr<cc::Display> display_; 65 scoped_ptr<cc::Display> display_;
68 ScopedMessagePipeHandle command_buffer_handle_; 66 ScopedMessagePipeHandle command_buffer_handle_;
69 67
70 DISALLOW_COPY_AND_ASSIGN(SurfacesImpl); 68 DISALLOW_COPY_AND_ASSIGN(SurfacesImpl);
71 }; 69 };
72 70
73 } // namespace surfaces
74 } // namespace mojo 71 } // namespace mojo
75 72
76 #endif // MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_ 73 #endif // MOJO_SERVICES_SURFACES_SURFACES_IMPL_H_
OLDNEW
« no previous file with comments | « mojo/services/public/interfaces/surfaces/surfaces.mojom ('k') | mojo/services/surfaces/surfaces_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698