| 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_CONTROLS_MENU_MENU_HOST_H_ | 5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_HOST_H_ |
| 6 #define UI_VIEWS_CONTROLS_MENU_MENU_HOST_H_ | 6 #define UI_VIEWS_CONTROLS_MENU_MENU_HOST_H_ |
| 7 | 7 |
| 8 #include <memory> |
| 9 |
| 8 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| 9 #include "base/macros.h" | 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | |
| 11 #include "ui/gfx/geometry/rect.h" | 12 #include "ui/gfx/geometry/rect.h" |
| 12 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
| 13 | 14 |
| 14 namespace views { | 15 namespace views { |
| 15 | 16 |
| 16 class NativeWidget; | 17 class NativeWidget; |
| 17 class SubmenuView; | 18 class SubmenuView; |
| 18 class View; | 19 class View; |
| 19 class Widget; | 20 class Widget; |
| 20 | 21 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 SubmenuView* submenu_; | 77 SubmenuView* submenu_; |
| 77 | 78 |
| 78 // If true, DestroyMenuHost has been invoked. | 79 // If true, DestroyMenuHost has been invoked. |
| 79 bool destroying_; | 80 bool destroying_; |
| 80 | 81 |
| 81 // If true and capture is lost we don't notify the delegate. | 82 // If true and capture is lost we don't notify the delegate. |
| 82 bool ignore_capture_lost_; | 83 bool ignore_capture_lost_; |
| 83 | 84 |
| 84 #if !defined(OS_MACOSX) | 85 #if !defined(OS_MACOSX) |
| 85 // Handles raw touch events at the moment. | 86 // Handles raw touch events at the moment. |
| 86 scoped_ptr<internal::PreMenuEventDispatchHandler> pre_dispatch_handler_; | 87 std::unique_ptr<internal::PreMenuEventDispatchHandler> pre_dispatch_handler_; |
| 87 #endif | 88 #endif |
| 88 | 89 |
| 89 DISALLOW_COPY_AND_ASSIGN(MenuHost); | 90 DISALLOW_COPY_AND_ASSIGN(MenuHost); |
| 90 }; | 91 }; |
| 91 | 92 |
| 92 } // namespace views | 93 } // namespace views |
| 93 | 94 |
| 94 #endif // UI_VIEWS_CONTROLS_MENU_MENU_HOST_H_ | 95 #endif // UI_VIEWS_CONTROLS_MENU_MENU_HOST_H_ |
| OLD | NEW |