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

Side by Side Diff: ui/aura/window_tree_host_ozone.h

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed bot failure: cast_shell_linux Created 5 years, 6 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_AURA_WINDOW_TREE_HOST_OZONE_H_ 5 #ifndef UI_AURA_WINDOW_TREE_HOST_OZONE_H_
6 #define UI_AURA_WINDOW_TREE_HOST_OZONE_H_ 6 #define UI_AURA_WINDOW_TREE_HOST_OZONE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "ui/aura/window_tree_host.h" 9 #include "ui/aura/window_tree_host.h"
10 #include "ui/events/event_source.h"
11 #include "ui/gfx/geometry/rect.h" 10 #include "ui/gfx/geometry/rect.h"
12 #include "ui/platform_window/platform_window_delegate.h" 11 #include "ui/platform_window/platform_window_delegate.h"
13 12
14 namespace ui { 13 namespace ui {
15 class PlatformWindow; 14 class PlatformWindow;
16 } 15 }
17 16
18 namespace aura { 17 namespace aura {
19 18
20 class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost, 19 class AURA_EXPORT WindowTreeHostOzone : public WindowTreeHost,
21 public ui::EventSource,
22 public ui::PlatformWindowDelegate { 20 public ui::PlatformWindowDelegate {
23 public: 21 public:
24 explicit WindowTreeHostOzone(const gfx::Rect& bounds); 22 explicit WindowTreeHostOzone(const gfx::Rect& bounds);
25 ~WindowTreeHostOzone() override; 23 ~WindowTreeHostOzone() override;
26 24
27 protected: 25 protected:
28 // WindowTreeHost: 26 // WindowTreeHost:
29 ui::EventSource* GetEventSource() override; 27 ui::EventSource* GetEventSource() override;
30 gfx::AcceleratedWidget GetAcceleratedWidget() override; 28 gfx::AcceleratedWidget GetAcceleratedWidget() override;
31 void ShowImpl() override; 29 void ShowImpl() override;
(...skipping 14 matching lines...) Expand all
46 void OnBoundsChanged(const gfx::Rect&) override; 44 void OnBoundsChanged(const gfx::Rect&) override;
47 void OnDamageRect(const gfx::Rect& damaged_region) override; 45 void OnDamageRect(const gfx::Rect& damaged_region) override;
48 void DispatchEvent(ui::Event* event) override; 46 void DispatchEvent(ui::Event* event) override;
49 void OnCloseRequest() override; 47 void OnCloseRequest() override;
50 void OnClosed() override; 48 void OnClosed() override;
51 void OnWindowStateChanged(ui::PlatformWindowState new_state) override; 49 void OnWindowStateChanged(ui::PlatformWindowState new_state) override;
52 void OnLostCapture() override; 50 void OnLostCapture() override;
53 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override; 51 void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget) override;
54 void OnActivationChanged(bool active) override; 52 void OnActivationChanged(bool active) override;
55 53
56 // ui::EventSource overrides.
57 ui::EventProcessor* GetEventProcessor() override;
58
59 // Platform-specific part of this WindowTreeHost. 54 // Platform-specific part of this WindowTreeHost.
60 scoped_ptr<ui::PlatformWindow> platform_window_; 55 scoped_ptr<ui::PlatformWindow> platform_window_;
61 56
62 // The identifier used to create a compositing surface. 57 // The identifier used to create a compositing surface.
63 gfx::AcceleratedWidget widget_; 58 gfx::AcceleratedWidget widget_;
64 59
65 // Current Aura cursor. 60 // Current Aura cursor.
66 gfx::NativeCursor current_cursor_; 61 gfx::NativeCursor current_cursor_;
67 62
68 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone); 63 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone);
69 }; 64 };
70 65
71 } // namespace aura 66 } // namespace aura
72 67
73 #endif // UI_AURA_WINDOW_TREE_HOST_OZONE_H_ 68 #endif // UI_AURA_WINDOW_TREE_HOST_OZONE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698