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

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

Issue 410873003: Revert 284850 "aura: Use PlatformWindow from WindowTreeHostWin." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | Annotate | Revision Log
« no previous file with comments | « trunk/src/ui/aura/aura.gyp ('k') | trunk/src/ui/aura/window_tree_host_ozone.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 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" 10 #include "ui/events/event_source.h"
(...skipping 17 matching lines...) Expand all
28 // ui::PlatformWindowDelegate: 28 // ui::PlatformWindowDelegate:
29 virtual void OnBoundsChanged(const gfx::Rect&) OVERRIDE; 29 virtual void OnBoundsChanged(const gfx::Rect&) OVERRIDE;
30 virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE; 30 virtual void OnDamageRect(const gfx::Rect& damaged_region) OVERRIDE;
31 virtual void DispatchEvent(ui::Event* event) OVERRIDE; 31 virtual void DispatchEvent(ui::Event* event) OVERRIDE;
32 virtual void OnCloseRequest() OVERRIDE; 32 virtual void OnCloseRequest() OVERRIDE;
33 virtual void OnClosed() OVERRIDE; 33 virtual void OnClosed() OVERRIDE;
34 virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) OVERRIDE; 34 virtual void OnWindowStateChanged(ui::PlatformWindowState new_state) OVERRIDE;
35 virtual void OnLostCapture() OVERRIDE; 35 virtual void OnLostCapture() OVERRIDE;
36 virtual void OnAcceleratedWidgetAvailable( 36 virtual void OnAcceleratedWidgetAvailable(
37 gfx::AcceleratedWidget widget) OVERRIDE; 37 gfx::AcceleratedWidget widget) OVERRIDE;
38 virtual void OnActivationChanged(bool active) OVERRIDE;
39 38
40 // WindowTreeHost: 39 // WindowTreeHost:
41 virtual ui::EventSource* GetEventSource() OVERRIDE; 40 virtual ui::EventSource* GetEventSource() OVERRIDE;
42 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE; 41 virtual gfx::AcceleratedWidget GetAcceleratedWidget() OVERRIDE;
43 virtual void Show() OVERRIDE; 42 virtual void Show() OVERRIDE;
44 virtual void Hide() OVERRIDE; 43 virtual void Hide() OVERRIDE;
45 virtual gfx::Rect GetBounds() const OVERRIDE; 44 virtual gfx::Rect GetBounds() const OVERRIDE;
46 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 45 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
47 virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE; 46 virtual gfx::Point GetLocationOnNativeScreen() const OVERRIDE;
48 virtual void SetCapture() OVERRIDE; 47 virtual void SetCapture() OVERRIDE;
(...skipping 11 matching lines...) Expand all
60 59
61 // The identifier used to create a compositing surface. 60 // The identifier used to create a compositing surface.
62 gfx::AcceleratedWidget widget_; 61 gfx::AcceleratedWidget widget_;
63 62
64 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone); 63 DISALLOW_COPY_AND_ASSIGN(WindowTreeHostOzone);
65 }; 64 };
66 65
67 } // namespace aura 66 } // namespace aura
68 67
69 #endif // UI_AURA_WINDOW_TREE_HOST_OZONE_H_ 68 #endif // UI_AURA_WINDOW_TREE_HOST_OZONE_H_
OLDNEW
« no previous file with comments | « trunk/src/ui/aura/aura.gyp ('k') | trunk/src/ui/aura/window_tree_host_ozone.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698