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

Side by Side Diff: components/mus/ws/platform_display.h

Issue 2080083002: Revert of Deletes mojo::Callback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 | « components/mus/ws/BUILD.gn ('k') | components/mus/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 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 COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_ 5 #ifndef COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
6 #define COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_ 6 #define COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 12
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
15 #include "base/strings/string16.h" 15 #include "base/strings/string16.h"
16 #include "base/timer/timer.h" 16 #include "base/timer/timer.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "cc/surfaces/surface.h" 18 #include "cc/surfaces/surface.h"
19 #include "components/mus/public/interfaces/window_manager.mojom.h" 19 #include "components/mus/public/interfaces/window_manager.mojom.h"
20 #include "components/mus/public/interfaces/window_manager_constants.mojom.h" 20 #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
21 #include "components/mus/public/interfaces/window_tree.mojom.h" 21 #include "components/mus/public/interfaces/window_tree.mojom.h"
22 #include "components/mus/ws/platform_display_delegate.h" 22 #include "components/mus/ws/platform_display_delegate.h"
23 #include "components/mus/ws/platform_display_init_params.h" 23 #include "components/mus/ws/platform_display_init_params.h"
24 #include "mojo/public/cpp/bindings/callback.h"
24 #include "ui/gfx/geometry/rect.h" 25 #include "ui/gfx/geometry/rect.h"
25 #include "ui/platform_window/platform_window_delegate.h" 26 #include "ui/platform_window/platform_window_delegate.h"
26 27
27 namespace cc { 28 namespace cc {
28 class CompositorFrame; 29 class CompositorFrame;
29 class CopyOutputRequest; 30 class CopyOutputRequest;
30 class SurfaceIdAllocator; 31 class SurfaceIdAllocator;
31 class SurfaceManager; 32 class SurfaceManager;
32 } // namespace cc 33 } // namespace cc
33 34
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_; 182 base::WeakPtrFactory<DefaultPlatformDisplay> weak_factory_;
182 183
183 DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay); 184 DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
184 }; 185 };
185 186
186 } // namespace ws 187 } // namespace ws
187 188
188 } // namespace mus 189 } // namespace mus
189 190
190 #endif // COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_ 191 #endif // COMPONENTS_MUS_WS_PLATFORM_DISPLAY_H_
OLDNEW
« no previous file with comments | « components/mus/ws/BUILD.gn ('k') | components/mus/ws/server_window_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698