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

Side by Side Diff: ui/ozone/platform/wayland/wayland_window.h

Issue 2147523003: Rename WaylandDisplay to WaylandConnection (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 UI_OZONE_PLATFORM_WAYLAND_WAYLAND_WINDOW_H_ 5 #ifndef UI_OZONE_PLATFORM_WAYLAND_WAYLAND_WINDOW_H_
6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_WINDOW_H_ 6 #define UI_OZONE_PLATFORM_WAYLAND_WAYLAND_WINDOW_H_
7 7
8 #include "ui/events/platform/platform_event_dispatcher.h" 8 #include "ui/events/platform/platform_event_dispatcher.h"
9 #include "ui/gfx/geometry/rect.h" 9 #include "ui/gfx/geometry/rect.h"
10 #include "ui/gfx/native_widget_types.h" 10 #include "ui/gfx/native_widget_types.h"
11 #include "ui/ozone/platform/wayland/wayland_object.h" 11 #include "ui/ozone/platform/wayland/wayland_object.h"
12 #include "ui/platform_window/platform_window.h" 12 #include "ui/platform_window/platform_window.h"
13 13
14 namespace ui { 14 namespace ui {
15 15
16 class WaylandDisplay; 16 class WaylandConnection;
17 17
18 class WaylandWindow : public PlatformWindow, public PlatformEventDispatcher { 18 class WaylandWindow : public PlatformWindow, public PlatformEventDispatcher {
19 public: 19 public:
20 WaylandWindow(PlatformWindowDelegate* delegate, 20 WaylandWindow(PlatformWindowDelegate* delegate,
21 WaylandDisplay* display, 21 WaylandConnection*,
Michael Forney 2016/07/12 21:06:49 Here too.
joone 2016/07/13 22:35:41 Done.
22 const gfx::Rect& bounds); 22 const gfx::Rect& bounds);
23 ~WaylandWindow() override; 23 ~WaylandWindow() override;
24 24
25 static WaylandWindow* FromSurface(wl_surface* surface); 25 static WaylandWindow* FromSurface(wl_surface* surface);
26 26
27 bool Initialize(); 27 bool Initialize();
28 28
29 wl_surface* surface() { return surface_.get(); } 29 wl_surface* surface() { return surface_.get(); }
30 30
31 // Apply the bounds specified in the most recent configure event. This should 31 // Apply the bounds specified in the most recent configure event. This should
(...skipping 29 matching lines...) Expand all
61 static void Configure(void* data, 61 static void Configure(void* data,
62 xdg_surface* obj, 62 xdg_surface* obj,
63 int32_t width, 63 int32_t width,
64 int32_t height, 64 int32_t height,
65 wl_array* states, 65 wl_array* states,
66 uint32_t serial); 66 uint32_t serial);
67 static void Close(void* data, xdg_surface* obj); 67 static void Close(void* data, xdg_surface* obj);
68 68
69 private: 69 private:
70 PlatformWindowDelegate* delegate_; 70 PlatformWindowDelegate* delegate_;
71 WaylandDisplay* display_; 71 WaylandConnection* connection_;
72 72
73 wl::Object<wl_surface> surface_; 73 wl::Object<wl_surface> surface_;
74 wl::Object<xdg_surface> xdg_surface_; 74 wl::Object<xdg_surface> xdg_surface_;
75 75
76 gfx::Rect bounds_; 76 gfx::Rect bounds_;
77 gfx::Rect pending_bounds_; 77 gfx::Rect pending_bounds_;
78 uint32_t pending_configure_serial_; 78 uint32_t pending_configure_serial_;
79 bool has_pointer_focus_ = false; 79 bool has_pointer_focus_ = false;
80 80
81 DISALLOW_COPY_AND_ASSIGN(WaylandWindow); 81 DISALLOW_COPY_AND_ASSIGN(WaylandWindow);
82 }; 82 };
83 83
84 } // namespace ui 84 } // namespace ui
85 85
86 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_WINDOW_H_ 86 #endif // UI_OZONE_PLATFORM_WAYLAND_WAYLAND_WINDOW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698