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

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

Issue 2610783003: mus: Make sure window parenting happens in the window server. (Closed)
Patch Set: . 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/platform_display.h ('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 26 matching lines...) Expand all
37 void SetViewportSize(const gfx::Size& size) override; 37 void SetViewportSize(const gfx::Size& size) override;
38 void SetTitle(const base::string16& title) override; 38 void SetTitle(const base::string16& title) override;
39 void SetCapture() override; 39 void SetCapture() override;
40 void ReleaseCapture() override; 40 void ReleaseCapture() override;
41 void SetCursorById(mojom::Cursor cursor) override; 41 void SetCursorById(mojom::Cursor cursor) override;
42 void UpdateTextInputState(const ui::TextInputState& state) override; 42 void UpdateTextInputState(const ui::TextInputState& state) override;
43 void SetImeVisibility(bool visible) override; 43 void SetImeVisibility(bool visible) override;
44 gfx::Rect GetBounds() const override; 44 gfx::Rect GetBounds() const override;
45 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override; 45 bool UpdateViewportMetrics(const display::ViewportMetrics& metrics) override;
46 const display::ViewportMetrics& GetViewportMetrics() const override; 46 const display::ViewportMetrics& GetViewportMetrics() const override;
47 gfx::AcceleratedWidget GetAcceleratedWidget() const override;
47 FrameGenerator* GetFrameGenerator() override; 48 FrameGenerator* GetFrameGenerator() override;
48 49
49 private: 50 private:
50 // Update the root_location of located events to be relative to the origin 51 // Update the root_location of located events to be relative to the origin
51 // of this display. For example, if the origin of this display is (1800, 0) 52 // of this display. For example, if the origin of this display is (1800, 0)
52 // and the location of the event is (100, 200) then the root_location will be 53 // and the location of the event is (100, 200) then the root_location will be
53 // updated to be (1900, 200). 54 // updated to be (1900, 200).
54 // TODO(riajiang): This is totally broken with HDPI. 55 // TODO(riajiang): This is totally broken with HDPI.
55 void UpdateEventRootLocation(ui::LocatedEvent* event); 56 void UpdateEventRootLocation(ui::LocatedEvent* event);
56 57
(...skipping 17 matching lines...) Expand all
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_;
85 gfx::AcceleratedWidget widget_;
84 86
85 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault); 87 DISALLOW_COPY_AND_ASSIGN(PlatformDisplayDefault);
86 }; 88 };
87 89
88 } // namespace ws 90 } // namespace ws
89 } // namespace ui 91 } // namespace ui
90 92
91 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_ 93 #endif // SERVICES_UI_WS_PLATFORM_DISPLAY_DEFAULT_H_
OLDNEW
« no previous file with comments | « services/ui/ws/platform_display.h ('k') | services/ui/ws/platform_display_default.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698