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

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

Issue 2613903003: Reland of "Mustash: Ensure surfaces submitted to Mus by WM and embedders contain Surfaces with embe… (Closed)
Patch Set: fix Created 3 years, 11 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/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_default.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_DEFAULT_H_ 5 #ifndef SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ 6 #define SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void OnCloseRequest() override; 61 void OnCloseRequest() override;
62 void OnClosed() override; 62 void OnClosed() override;
63 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; 63 void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
64 void OnLostCapture() override; 64 void OnLostCapture() override;
65 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget, 65 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget,
66 float device_scale_factor) override; 66 float device_scale_factor) override;
67 void OnAcceleratedWidgetDestroyed() override; 67 void OnAcceleratedWidgetDestroyed() override;
68 void OnActivationChanged(bool active) override; 68 void OnActivationChanged(bool active) override;
69 69
70 // FrameGeneratorDelegate: 70 // FrameGeneratorDelegate:
71 ServerWindow* GetActiveRootWindow() override;
71 bool IsInHighContrastMode() override; 72 bool IsInHighContrastMode() override;
72 73
73 const int64_t display_id_; 74 const int64_t display_id_;
74 75
75 #if !defined(OS_ANDROID) 76 #if !defined(OS_ANDROID)
76 std::unique_ptr<ui::ImageCursors> image_cursors_; 77 std::unique_ptr<ui::ImageCursors> image_cursors_;
77 #endif 78 #endif
78 79
79 PlatformDisplayDelegate* delegate_ = nullptr; 80 PlatformDisplayDelegate* delegate_ = nullptr;
80 std::unique_ptr<FrameGenerator> frame_generator_; 81 std::unique_ptr<FrameGenerator> frame_generator_;
81 82
82 display::ViewportMetrics metrics_; 83 display::ViewportMetrics metrics_;
83 std::unique_ptr<ui::PlatformWindow> platform_window_; 84 std::unique_ptr<ui::PlatformWindow> platform_window_;
84 85
85 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); 86 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault);
86 }; 87 };
87 88
88 } // namespace ws 89 } // namespace ws
89 } // namespace ui 90 } // namespace ui
90 91
91 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ 92 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
OLDNEW
« no previous file with comments | « services/ui/ws/frame_generator_unittest.cc ('k') | services/ui/ws/platform_display_default.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698