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

Side by Side Diff: services/ui/ws/server_window_surface.h

Issue 2386763002: services/ui: Match naming in cc (and jellyfish branch) (Closed)
Patch Set: Removed bad change Created 4 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 | « services/ui/ws/server_window_delegate.h ('k') | services/ui/ws/server_window_surface.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_ 5 #ifndef SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_
6 #define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_ 6 #define SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "cc/ipc/compositor_frame.mojom.h" 11 #include "cc/ipc/compositor_frame.mojom.h"
12 #include "cc/surfaces/surface_factory.h" 12 #include "cc/surfaces/surface_factory.h"
13 #include "cc/surfaces/surface_factory_client.h" 13 #include "cc/surfaces/surface_factory_client.h"
14 #include "cc/surfaces/surface_id.h" 14 #include "cc/surfaces/surface_id.h"
15 #include "cc/surfaces/surface_id_allocator.h" 15 #include "cc/surfaces/surface_id_allocator.h"
16 #include "mojo/public/cpp/bindings/binding.h" 16 #include "mojo/public/cpp/bindings/binding.h"
17 #include "services/ui/public/interfaces/surface.mojom.h" 17 #include "services/ui/public/interfaces/surface.mojom.h"
18 #include "services/ui/public/interfaces/window_tree.mojom.h" 18 #include "services/ui/public/interfaces/window_tree.mojom.h"
19 #include "services/ui/ws/ids.h" 19 #include "services/ui/ws/ids.h"
20 20
21 namespace ui { 21 namespace ui {
22 22
23 class SurfacesState; 23 class DisplayCompositor;
24 24
25 namespace ws { 25 namespace ws {
26 26
27 class ServerWindow; 27 class ServerWindow;
28 class ServerWindowSurfaceManager; 28 class ServerWindowSurfaceManager;
29 29
30 // Server side representation of a WindowSurface. 30 // Server side representation of a WindowSurface.
31 class ServerWindowSurface : public mojom::Surface, 31 class ServerWindowSurface : public mojom::Surface,
32 public cc::SurfaceFactoryClient { 32 public cc::SurfaceFactoryClient {
33 public: 33 public:
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 bool may_contain_video_ = false; 77 bool may_contain_video_ = false;
78 78
79 DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface); 79 DISALLOW_COPY_AND_ASSIGN(ServerWindowSurface);
80 }; 80 };
81 81
82 } // namespace ws 82 } // namespace ws
83 83
84 } // namespace ui 84 } // namespace ui
85 85
86 #endif // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_ 86 #endif // SERVICES_UI_WS_SERVER_WINDOW_SURFACE_H_
OLDNEW
« no previous file with comments | « services/ui/ws/server_window_delegate.h ('k') | services/ui/ws/server_window_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698