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

Side by Side Diff: ui/ozone/platform/dri/dri_window.h

Issue 527293002: ozone: Remove CursorFactoryOzone::SetCursor, GetCursorWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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 | « ui/ozone/platform/dri/dri_cursor.cc ('k') | ui/ozone/platform/dri/dri_window.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 UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_ 5 #ifndef UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
6 #define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_ 6 #define UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/events/platform/platform_event_dispatcher.h" 9 #include "ui/events/platform/platform_event_dispatcher.h"
10 #include "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
11 #include "ui/gfx/native_widget_types.h" 11 #include "ui/gfx/native_widget_types.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 DriCursor;
16 class DriWindowDelegate; 17 class DriWindowDelegate;
17 class DriWindowManager; 18 class DriWindowManager;
18 class EventFactoryEvdev; 19 class EventFactoryEvdev;
19 20
20 class DriWindow : public PlatformWindow, 21 class DriWindow : public PlatformWindow,
21 public PlatformEventDispatcher { 22 public PlatformEventDispatcher {
22 public: 23 public:
23 DriWindow(PlatformWindowDelegate* delegate, 24 DriWindow(PlatformWindowDelegate* delegate,
24 const gfx::Rect& bounds, 25 const gfx::Rect& bounds,
25 scoped_ptr<DriWindowDelegate> dri_window_delegate, 26 scoped_ptr<DriWindowDelegate> dri_window_delegate,
26 EventFactoryEvdev* event_factory, 27 EventFactoryEvdev* event_factory,
27 DriWindowManager* window_manager); 28 DriWindowManager* window_manager,
29 DriCursor* cursor);
28 virtual ~DriWindow(); 30 virtual ~DriWindow();
29 31
30 void Initialize(); 32 void Initialize();
31 33
32 // PlatformWindow: 34 // PlatformWindow:
33 virtual void Show() OVERRIDE; 35 virtual void Show() OVERRIDE;
34 virtual void Hide() OVERRIDE; 36 virtual void Hide() OVERRIDE;
35 virtual void Close() OVERRIDE; 37 virtual void Close() OVERRIDE;
36 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 38 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
37 virtual gfx::Rect GetBounds() OVERRIDE; 39 virtual gfx::Rect GetBounds() OVERRIDE;
(...skipping 10 matching lines...) Expand all
48 virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE; 50 virtual bool CanDispatchEvent(const PlatformEvent& event) OVERRIDE;
49 virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE; 51 virtual uint32_t DispatchEvent(const PlatformEvent& event) OVERRIDE;
50 52
51 private: 53 private:
52 PlatformWindowDelegate* delegate_; 54 PlatformWindowDelegate* delegate_;
53 gfx::Rect bounds_; 55 gfx::Rect bounds_;
54 gfx::AcceleratedWidget widget_; 56 gfx::AcceleratedWidget widget_;
55 DriWindowDelegate* dri_window_delegate_; 57 DriWindowDelegate* dri_window_delegate_;
56 EventFactoryEvdev* event_factory_; 58 EventFactoryEvdev* event_factory_;
57 DriWindowManager* window_manager_; 59 DriWindowManager* window_manager_;
60 DriCursor* cursor_;
58 61
59 DISALLOW_COPY_AND_ASSIGN(DriWindow); 62 DISALLOW_COPY_AND_ASSIGN(DriWindow);
60 }; 63 };
61 64
62 } // namespace ui 65 } // namespace ui
63 66
64 #endif // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_ 67 #endif // UI_OZONE_PLATFORM_DRI_DRI_WINDOW_H_
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/dri_cursor.cc ('k') | ui/ozone/platform/dri/dri_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698