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

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

Issue 2310133002: Add mojom::DisplayController. (Closed)
Patch Set: Add missing dep. Created 4 years, 3 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/display_manager.cc ('k') | services/ui/ws/platform_display.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 SERVICES_UI_WS_PLATFORM_DISPLAY_H_ 5 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_H_
6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_H_ 6 #define SERVICES_UI_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 #include <utility> 12 #include <utility>
13 13
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
16 #include "base/strings/string16.h" 16 #include "base/strings/string16.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "services/ui/display/platform_screen.h"
19 #include "services/ui/public/interfaces/window_manager.mojom.h" 18 #include "services/ui/public/interfaces/window_manager.mojom.h"
20 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" 19 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
21 #include "services/ui/public/interfaces/window_tree.mojom.h" 20 #include "services/ui/public/interfaces/window_tree.mojom.h"
22 #include "services/ui/ws/frame_generator.h" 21 #include "services/ui/ws/frame_generator.h"
23 #include "services/ui/ws/frame_generator_delegate.h" 22 #include "services/ui/ws/frame_generator_delegate.h"
24 #include "services/ui/ws/platform_display_delegate.h" 23 #include "services/ui/ws/platform_display_delegate.h"
25 #include "ui/display/display.h" 24 #include "ui/display/display.h"
26 #include "ui/platform_window/platform_window_delegate.h" 25 #include "ui/platform_window/platform_window_delegate.h"
27 26
28 namespace cc { 27 namespace cc {
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 void OnAcceleratedWidgetDestroyed() override; 164 void OnAcceleratedWidgetDestroyed() override;
166 void OnActivationChanged(bool active) override; 165 void OnActivationChanged(bool active) override;
167 166
168 // FrameGeneratorDelegate: 167 // FrameGeneratorDelegate:
169 ServerWindow* GetRootWindow() override; 168 ServerWindow* GetRootWindow() override;
170 void OnCompositorFrameDrawn() override; 169 void OnCompositorFrameDrawn() override;
171 bool IsInHighContrastMode() override; 170 bool IsInHighContrastMode() override;
172 const ViewportMetrics& GetViewportMetrics() override; 171 const ViewportMetrics& GetViewportMetrics() override;
173 172
174 int64_t id_; 173 int64_t id_;
175 display::PlatformScreen* platform_screen_;
176 174
177 #if !defined(OS_ANDROID) 175 #if !defined(OS_ANDROID)
178 std::unique_ptr<ui::CursorLoader> cursor_loader_; 176 std::unique_ptr<ui::CursorLoader> cursor_loader_;
179 #endif 177 #endif
180 178
181 PlatformDisplayDelegate* delegate_ = nullptr; 179 PlatformDisplayDelegate* delegate_ = nullptr;
182 std::unique_ptr<FrameGenerator> frame_generator_; 180 std::unique_ptr<FrameGenerator> frame_generator_;
183 181
184 ViewportMetrics metrics_; 182 ViewportMetrics metrics_;
185 std::unique_ptr<ui::PlatformWindow> platform_window_; 183 std::unique_ptr<ui::PlatformWindow> platform_window_;
186 184
187 DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay); 185 DISALLOW_COPY_AND_ASSIGN(DefaultPlatformDisplay);
188 }; 186 };
189 187
190 } // namespace ws 188 } // namespace ws
191 189
192 } // namespace ui 190 } // namespace ui
193 191
194 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_H_ 192 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_H_
OLDNEW
« no previous file with comments | « services/ui/ws/display_manager.cc ('k') | services/ui/ws/platform_display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698