| 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 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include "ui/aura/root_window_observer.h" | 9 #include "ui/aura/root_window_observer.h" |
| 10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 | 22 |
| 23 namespace ui { | 23 namespace ui { |
| 24 #if defined(OS_WIN) | 24 #if defined(OS_WIN) |
| 25 class HWNDSubclass; | 25 class HWNDSubclass; |
| 26 #endif | 26 #endif |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace views { | 29 namespace views { |
| 30 class NativeWidgetAura; | 30 class NativeWidgetAura; |
| 31 class WidgetMessageFilter; | 31 class WidgetMessageFilter; |
| 32 #if defined(USE_X11) |
| 33 class X11WindowEventFilter; |
| 34 #endif |
| 32 | 35 |
| 33 // Implementation of non-Ash desktop integration code, allowing | 36 // Implementation of non-Ash desktop integration code, allowing |
| 34 // NativeWidgetAuras to work in a traditional desktop environment. | 37 // NativeWidgetAuras to work in a traditional desktop environment. |
| 35 class VIEWS_EXPORT DesktopNativeWidgetHelperAura | 38 class VIEWS_EXPORT DesktopNativeWidgetHelperAura |
| 36 : public NativeWidgetHelperAura, | 39 : public NativeWidgetHelperAura, |
| 37 public aura::RootWindowObserver { | 40 public aura::RootWindowObserver { |
| 38 public: | 41 public: |
| 39 explicit DesktopNativeWidgetHelperAura(NativeWidgetAura* widget); | 42 explicit DesktopNativeWidgetHelperAura(NativeWidgetAura* widget); |
| 40 virtual ~DesktopNativeWidgetHelperAura(); | 43 virtual ~DesktopNativeWidgetHelperAura(); |
| 41 | 44 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 66 // An event filter that pre-handles all key events to send them to an IME. | 69 // An event filter that pre-handles all key events to send them to an IME. |
| 67 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; | 70 scoped_ptr<aura::shared::InputMethodEventFilter> input_method_filter_; |
| 68 | 71 |
| 69 // We want some windows (omnibox, status bar) to have their own | 72 // We want some windows (omnibox, status bar) to have their own |
| 70 // NativeWidgetAura, but still act as if they're screen bounded toplevel | 73 // NativeWidgetAura, but still act as if they're screen bounded toplevel |
| 71 // windows. | 74 // windows. |
| 72 bool is_embedded_window_; | 75 bool is_embedded_window_; |
| 73 | 76 |
| 74 #if defined(OS_WIN) | 77 #if defined(OS_WIN) |
| 75 scoped_ptr<ui::HWNDSubclass> subclass_; | 78 scoped_ptr<ui::HWNDSubclass> subclass_; |
| 79 #elif defined(USE_X11) |
| 80 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; |
| 76 #endif | 81 #endif |
| 77 | 82 |
| 78 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); | 83 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); |
| 79 }; | 84 }; |
| 80 | 85 |
| 81 } // namespace views | 86 } // namespace views |
| 82 | 87 |
| 83 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ | 88 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ |
| OLD | NEW |