| 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 <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 std::unique_ptr<DropHelper> drop_helper_; | 273 std::unique_ptr<DropHelper> drop_helper_; |
| 274 int last_drop_operation_; | 274 int last_drop_operation_; |
| 275 | 275 |
| 276 std::unique_ptr<corewm::TooltipController> tooltip_controller_; | 276 std::unique_ptr<corewm::TooltipController> tooltip_controller_; |
| 277 std::unique_ptr<TooltipManagerAura> tooltip_manager_; | 277 std::unique_ptr<TooltipManagerAura> tooltip_manager_; |
| 278 | 278 |
| 279 std::unique_ptr<wm::VisibilityController> visibility_controller_; | 279 std::unique_ptr<wm::VisibilityController> visibility_controller_; |
| 280 | 280 |
| 281 std::unique_ptr<wm::WindowModalityController> window_modality_controller_; | 281 std::unique_ptr<wm::WindowModalityController> window_modality_controller_; |
| 282 | 282 |
| 283 bool restore_focus_on_activate_; | |
| 284 | |
| 285 gfx::NativeCursor cursor_; | 283 gfx::NativeCursor cursor_; |
| 286 // We must manually reference count the number of users of |cursor_manager_| | 284 // We must manually reference count the number of users of |cursor_manager_| |
| 287 // because the cursors created by |cursor_manager_| are shared among the | 285 // because the cursors created by |cursor_manager_| are shared among the |
| 288 // DNWAs. We can't just stuff this in a LazyInstance because we need to | 286 // DNWAs. We can't just stuff this in a LazyInstance because we need to |
| 289 // destroy this as the last DNWA happens; we can't put it off until | 287 // destroy this as the last DNWA happens; we can't put it off until |
| 290 // (potentially) after we tear down the X11 connection because that's a | 288 // (potentially) after we tear down the X11 connection because that's a |
| 291 // crash. | 289 // crash. |
| 292 static int cursor_reference_count_; | 290 static int cursor_reference_count_; |
| 293 static wm::CursorManager* cursor_manager_; | 291 static wm::CursorManager* cursor_manager_; |
| 294 static views::DesktopNativeCursorManager* native_cursor_manager_; | 292 static views::DesktopNativeCursorManager* native_cursor_manager_; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 305 // The following factory is used for calls to close the NativeWidgetAura | 303 // The following factory is used for calls to close the NativeWidgetAura |
| 306 // instance. | 304 // instance. |
| 307 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; | 305 base::WeakPtrFactory<DesktopNativeWidgetAura> close_widget_factory_; |
| 308 | 306 |
| 309 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); | 307 DISALLOW_COPY_AND_ASSIGN(DesktopNativeWidgetAura); |
| 310 }; | 308 }; |
| 311 | 309 |
| 312 } // namespace views | 310 } // namespace views |
| 313 | 311 |
| 314 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ | 312 #endif // UI_VIEWS_WIDGET_DESKTOP_AURA_DESKTOP_NATIVE_WIDGET_AURA_H_ |
| OLD | NEW |