| 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_NATIVE_WIDGET_HELPER_AURA_H_ | 5 #ifndef UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ |
| 6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ | 6 #define UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ |
| 7 | 7 |
| 8 #include "ui/aura/root_window_observer.h" | 8 #include "ui/aura/root_window_observer.h" |
| 9 #include "ui/gfx/rect.h" | 9 #include "ui/gfx/rect.h" |
| 10 #include "ui/views/views_export.h" | 10 #include "ui/views/views_export.h" |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 55 virtual void PreInitialize(aura::Window* window, | 55 virtual void PreInitialize(aura::Window* window, |
| 56 const Widget::InitParams& params) OVERRIDE; | 56 const Widget::InitParams& params) OVERRIDE; |
| 57 virtual void PostInitialize() OVERRIDE; | 57 virtual void PostInitialize() OVERRIDE; |
| 58 virtual void ShowRootWindow() OVERRIDE; | 58 virtual void ShowRootWindow() OVERRIDE; |
| 59 virtual aura::RootWindow* GetRootWindow() OVERRIDE; | 59 virtual aura::RootWindow* GetRootWindow() OVERRIDE; |
| 60 virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) OVERRIDE; | 60 virtual gfx::Rect ModifyAndSetBounds(const gfx::Rect& bounds) OVERRIDE; |
| 61 | 61 |
| 62 // Overridden from aura::RootWindowObserver: | 62 // Overridden from aura::RootWindowObserver: |
| 63 virtual void OnRootWindowResized(const aura::RootWindow* root, | 63 virtual void OnRootWindowResized(const aura::RootWindow* root, |
| 64 const gfx::Size& old_size) OVERRIDE; | 64 const gfx::Size& old_size) OVERRIDE; |
| 65 virtual void OnRootWindowHostClosed(const aura::RootWindow* root) OVERRIDE; | 65 virtual void OnRootWindowHostCloseRequested( |
| 66 const aura::RootWindow* root) OVERRIDE; |
| 66 | 67 |
| 67 private: | 68 private: |
| 68 // A weak pointer back to our owning widget. | 69 // A weak pointer back to our owning widget. |
| 69 NativeWidgetAura* widget_; | 70 NativeWidgetAura* widget_; |
| 70 | 71 |
| 71 // Optionally, a RootWindow that we attach ourselves to. | 72 // Optionally, a RootWindow that we attach ourselves to. |
| 72 scoped_ptr<aura::RootWindow> root_window_; | 73 scoped_ptr<aura::RootWindow> root_window_; |
| 73 | 74 |
| 74 // Toplevel event filter which dispatches to other event filters. | 75 // Toplevel event filter which dispatches to other event filters. |
| 75 aura::shared::CompoundEventFilter* root_window_event_filter_; | 76 aura::shared::CompoundEventFilter* root_window_event_filter_; |
| (...skipping 22 matching lines...) Expand all Loading... |
| 98 #elif defined(USE_X11) | 99 #elif defined(USE_X11) |
| 99 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; | 100 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; |
| 100 #endif | 101 #endif |
| 101 | 102 |
| 102 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); | 103 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); |
| 103 }; | 104 }; |
| 104 | 105 |
| 105 } // namespace views | 106 } // namespace views |
| 106 | 107 |
| 107 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ | 108 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ |
| OLD | NEW |