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

Side by Side Diff: ui/views/widget/desktop_native_widget_aura.h

Issue 10913237: Allow the Views Delegate to provide the native widget. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « ui/views/views_switches.cc ('k') | ui/views/widget/widget.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_ 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_ 6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
7 7
8 #include "ui/aura/window_delegate.h" 8 #include "ui/aura/window_delegate.h"
9 #include "ui/views/widget/native_widget_private.h" 9 #include "ui/views/widget/native_widget_private.h"
10 #include "ui/views/widget/widget.h" 10 #include "ui/views/widget/widget.h"
11 11
12 namespace views { 12 namespace views {
13 13
14 class DesktopRootWindowHost; 14 class DesktopRootWindowHost;
15 15
16 class VIEWS_EXPORT DesktopNativeWidgetAura 16 class VIEWS_EXPORT DesktopNativeWidgetAura
17 : public internal::NativeWidgetPrivate, 17 : public internal::NativeWidgetPrivate,
18 public aura::WindowDelegate { 18 public aura::WindowDelegate {
19 public: 19 public:
20 explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate); 20 explicit DesktopNativeWidgetAura(internal::NativeWidgetDelegate* delegate);
21 virtual ~DesktopNativeWidgetAura(); 21 virtual ~DesktopNativeWidgetAura();
22 22
23 private: 23 protected:
24 // Overridden from internal::NativeWidgetPrivate: 24 // Overridden from internal::NativeWidgetPrivate:
25 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE; 25 virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
26 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE; 26 virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
27 virtual bool ShouldUseNativeFrame() const OVERRIDE; 27 virtual bool ShouldUseNativeFrame() const OVERRIDE;
28 virtual void FrameTypeChanged() OVERRIDE; 28 virtual void FrameTypeChanged() OVERRIDE;
29 virtual Widget* GetWidget() OVERRIDE; 29 virtual Widget* GetWidget() OVERRIDE;
30 virtual const Widget* GetWidget() const OVERRIDE; 30 virtual const Widget* GetWidget() const OVERRIDE;
31 virtual gfx::NativeView GetNativeView() const OVERRIDE; 31 virtual gfx::NativeView GetNativeView() const OVERRIDE;
32 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE; 32 virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
33 virtual Widget* GetTopLevelWidget() OVERRIDE; 33 virtual Widget* GetTopLevelWidget() OVERRIDE;
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 virtual bool HasHitTestMask() const OVERRIDE; 128 virtual bool HasHitTestMask() const OVERRIDE;
129 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; 129 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
130 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; 130 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE;
131 131
132 // Overridden from ui::EventHandler: 132 // Overridden from ui::EventHandler:
133 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE; 133 virtual ui::EventResult OnKeyEvent(ui::KeyEvent* event) OVERRIDE;
134 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE; 134 virtual ui::EventResult OnMouseEvent(ui::MouseEvent* event) OVERRIDE;
135 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE; 135 virtual ui::TouchStatus OnTouchEvent(ui::TouchEvent* event) OVERRIDE;
136 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE; 136 virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
137 137
138 private:
138 scoped_ptr<DesktopRootWindowHost> desktop_root_window_host_; 139 scoped_ptr<DesktopRootWindowHost> desktop_root_window_host_;
139 aura::Window* window_; 140 aura::Window* window_;
140 Widget::InitParams::Ownership ownership_; 141 Widget::InitParams::Ownership ownership_;
141 internal::NativeWidgetDelegate* native_widget_delegate_; 142 internal::NativeWidgetDelegate* native_widget_delegate_;
142 143
143 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); 144 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura);
144 }; 145 };
145 146
146 } // namespace views 147 } // namespace views
147 148
148 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_ 149 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_AURA_H_
OLDNEW
« no previous file with comments | « ui/views/views_switches.cc ('k') | ui/views/widget/widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698