| 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" |
| 11 #include "ui/views/widget/native_widget_helper_aura.h" | 11 #include "ui/views/widget/native_widget_helper_aura.h" |
| 12 #include "ui/views/widget/widget.h" | 12 #include "ui/views/widget/widget.h" |
| 13 | 13 |
| 14 namespace aura { | 14 namespace aura { |
| 15 class RootWindow; | 15 class RootWindow; |
| 16 class DesktopCursorClient; |
| 16 namespace client { | 17 namespace client { |
| 17 class ScreenPositionClient; | 18 class ScreenPositionClient; |
| 18 } | 19 } |
| 19 namespace shared { | 20 namespace shared { |
| 20 class CompoundEventFilter; | 21 class CompoundEventFilter; |
| 21 class InputMethodEventFilter; | 22 class InputMethodEventFilter; |
| 22 class RootWindowCaptureClient; | 23 class RootWindowCaptureClient; |
| 23 } | 24 } |
| 24 } | 25 } |
| 25 | 26 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 | 83 |
| 83 // We want some windows (omnibox, status bar) to have their own | 84 // We want some windows (omnibox, status bar) to have their own |
| 84 // NativeWidgetAura, but still act as if they're screen bounded toplevel | 85 // NativeWidgetAura, but still act as if they're screen bounded toplevel |
| 85 // windows. | 86 // windows. |
| 86 bool is_embedded_window_; | 87 bool is_embedded_window_; |
| 87 | 88 |
| 88 // In some cases, we set a screen position client on |root_window_|. If we | 89 // In some cases, we set a screen position client on |root_window_|. If we |
| 89 // do, we're responsible for the lifetime. | 90 // do, we're responsible for the lifetime. |
| 90 scoped_ptr<aura::client::ScreenPositionClient> position_client_; | 91 scoped_ptr<aura::client::ScreenPositionClient> position_client_; |
| 91 | 92 |
| 93 // A simple cursor client which just forwards events to the RootWindow. |
| 94 scoped_ptr<aura::DesktopCursorClient> cursor_client_; |
| 95 |
| 92 #if defined(OS_WIN) | 96 #if defined(OS_WIN) |
| 93 scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_; | 97 scoped_ptr<ui::HWNDMessageFilter> hwnd_message_filter_; |
| 94 #elif defined(USE_X11) | 98 #elif defined(USE_X11) |
| 95 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; | 99 scoped_ptr<X11WindowEventFilter> x11_window_event_filter_; |
| 96 #endif | 100 #endif |
| 97 | 101 |
| 98 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); | 102 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetHelperAura); |
| 99 }; | 103 }; |
| 100 | 104 |
| 101 } // namespace views | 105 } // namespace views |
| 102 | 106 |
| 103 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ | 107 #endif // UI_VIEWS_WIDGET_DESKTOP_NATIVE_WIDGET_HELPER_AURA_H_ |
| OLD | NEW |