Chromium Code Reviews| OLD | NEW |
|---|---|
| 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_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| 7 | 7 |
| 8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
| 9 #include "ui/aura/client/activation_change_observer.h" | 9 #include "ui/aura/client/activation_change_observer.h" |
| 10 #include "ui/aura/client/activation_delegate.h" | 10 #include "ui/aura/client/activation_delegate.h" |
| (...skipping 10 matching lines...) Expand all Loading... | |
| 21 } | 21 } |
| 22 } | 22 } |
| 23 | 23 |
| 24 namespace views { | 24 namespace views { |
| 25 | 25 |
| 26 namespace corewm { | 26 namespace corewm { |
| 27 class CompoundEventFilter; | 27 class CompoundEventFilter; |
| 28 class InputMethodEventFilter; | 28 class InputMethodEventFilter; |
| 29 class ShadowController; | 29 class ShadowController; |
| 30 class TooltipController; | 30 class TooltipController; |
| 31 class VisibilityController; | |
| 31 } | 32 } |
| 32 | 33 |
| 33 class DesktopRootWindowHost; | 34 class DesktopRootWindowHost; |
| 34 class DropHelper; | 35 class DropHelper; |
| 35 class NativeWidgetAuraWindowObserver; | 36 class NativeWidgetAuraWindowObserver; |
| 36 class TooltipManagerAura; | 37 class TooltipManagerAura; |
| 37 | 38 |
| 38 // TODO(erg): May also need to be a DragDropDelegate | 39 // TODO(erg): May also need to be a DragDropDelegate |
| 39 class VIEWS_EXPORT DesktopNativeWidgetAura | 40 class VIEWS_EXPORT DesktopNativeWidgetAura |
| 40 : public internal::NativeWidgetPrivate, | 41 : public internal::NativeWidgetPrivate, |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 141 virtual Widget::MoveLoopResult RunMoveLoop( | 142 virtual Widget::MoveLoopResult RunMoveLoop( |
| 142 const gfx::Vector2d& drag_offset, | 143 const gfx::Vector2d& drag_offset, |
| 143 Widget::MoveLoopSource source) OVERRIDE; | 144 Widget::MoveLoopSource source) OVERRIDE; |
| 144 virtual void EndMoveLoop() OVERRIDE; | 145 virtual void EndMoveLoop() OVERRIDE; |
| 145 virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; | 146 virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE; |
| 146 virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE; | 147 virtual ui::NativeTheme* GetNativeTheme() const OVERRIDE; |
| 147 | 148 |
| 148 // Overridden from aura::WindowDelegate: | 149 // Overridden from aura::WindowDelegate: |
| 149 virtual gfx::Size GetMinimumSize() const OVERRIDE; | 150 virtual gfx::Size GetMinimumSize() const OVERRIDE; |
| 150 virtual gfx::Size GetMaximumSize() const OVERRIDE; | 151 virtual gfx::Size GetMaximumSize() const OVERRIDE; |
| 152 virtual void SetHostTransitionBounds(const gfx::Rect& bounds) OVERRIDE; | |
| 151 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, | 153 virtual void OnBoundsChanged(const gfx::Rect& old_bounds, |
| 152 const gfx::Rect& new_bounds) OVERRIDE; | 154 const gfx::Rect& new_bounds) OVERRIDE; |
| 153 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; | 155 virtual gfx::NativeCursor GetCursor(const gfx::Point& point) OVERRIDE; |
| 154 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; | 156 virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE; |
| 155 virtual bool ShouldDescendIntoChildForEventHandling( | 157 virtual bool ShouldDescendIntoChildForEventHandling( |
| 156 aura::Window* child, | 158 aura::Window* child, |
| 157 const gfx::Point& location) OVERRIDE; | 159 const gfx::Point& location) OVERRIDE; |
| 158 virtual bool CanFocus() OVERRIDE; | 160 virtual bool CanFocus() OVERRIDE; |
| 159 virtual void OnCaptureLost() OVERRIDE; | 161 virtual void OnCaptureLost() OVERRIDE; |
| 160 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; | 162 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE; |
| 161 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; | 163 virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE; |
| 164 virtual void OnWindowHidingAnimationCompleted() OVERRIDE; | |
| 162 virtual void OnWindowDestroying() OVERRIDE; | 165 virtual void OnWindowDestroying() OVERRIDE; |
| 163 virtual void OnWindowDestroyed() OVERRIDE; | 166 virtual void OnWindowDestroyed() OVERRIDE; |
| 164 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; | 167 virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE; |
| 165 virtual bool HasHitTestMask() const OVERRIDE; | 168 virtual bool HasHitTestMask() const OVERRIDE; |
| 166 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; | 169 virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE; |
| 167 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; | 170 virtual scoped_refptr<ui::Texture> CopyTexture() OVERRIDE; |
| 168 | 171 |
| 169 // Overridden from ui::EventHandler: | 172 // Overridden from ui::EventHandler: |
| 170 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; | 173 virtual void OnKeyEvent(ui::KeyEvent* event) OVERRIDE; |
| 171 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; | 174 virtual void OnMouseEvent(ui::MouseEvent* event) OVERRIDE; |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 corewm::CompoundEventFilter* root_window_event_filter_; | 224 corewm::CompoundEventFilter* root_window_event_filter_; |
| 222 | 225 |
| 223 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_; | 226 scoped_ptr<corewm::InputMethodEventFilter> input_method_event_filter_; |
| 224 | 227 |
| 225 scoped_ptr<DropHelper> drop_helper_; | 228 scoped_ptr<DropHelper> drop_helper_; |
| 226 int last_drop_operation_; | 229 int last_drop_operation_; |
| 227 | 230 |
| 228 scoped_ptr<corewm::TooltipController> tooltip_controller_; | 231 scoped_ptr<corewm::TooltipController> tooltip_controller_; |
| 229 scoped_ptr<TooltipManagerAura> tooltip_manager_; | 232 scoped_ptr<TooltipManagerAura> tooltip_manager_; |
| 230 | 233 |
| 234 scoped_ptr<views::corewm::VisibilityController> visibility_controller_; | |
| 235 | |
| 231 // See comments in OnLostActive(). | 236 // See comments in OnLostActive(). |
| 232 bool restore_focus_on_activate_; | 237 bool restore_focus_on_activate_; |
| 233 | 238 |
| 234 scoped_ptr<corewm::ShadowController> shadow_controller_; | 239 scoped_ptr<corewm::ShadowController> shadow_controller_; |
| 235 | 240 |
| 241 bool pending_close_; | |
|
sky
2013/03/14 20:06:37
Description?
scottmg
2013/03/14 22:51:53
Done.
| |
| 242 | |
| 236 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); | 243 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
| 237 }; | 244 }; |
| 238 | 245 |
| 239 } // namespace views | 246 } // namespace views |
| 240 | 247 |
| 241 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 248 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| OLD | NEW |