OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #include "ui/views/controls/menu/menu_runner.h" | 5 #include "ui/views/controls/menu/menu_runner.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ptr_util.h" |
12 #include "base/strings/utf_string_conversions.h" | 13 #include "base/strings/utf_string_conversions.h" |
13 #include "ui/base/ui_base_types.h" | 14 #include "ui/base/ui_base_types.h" |
14 #include "ui/events/test/event_generator.h" | 15 #include "ui/events/test/event_generator.h" |
15 #include "ui/views/controls/menu/menu_delegate.h" | 16 #include "ui/views/controls/menu/menu_delegate.h" |
16 #include "ui/views/controls/menu/menu_item_view.h" | 17 #include "ui/views/controls/menu/menu_item_view.h" |
17 #include "ui/views/controls/menu/menu_runner_impl.h" | 18 #include "ui/views/controls/menu/menu_runner_impl.h" |
18 #include "ui/views/controls/menu/menu_types.h" | 19 #include "ui/views/controls/menu/menu_types.h" |
19 #include "ui/views/controls/menu/submenu_view.h" | 20 #include "ui/views/controls/menu/submenu_view.h" |
20 #include "ui/views/test/menu_test_utils.h" | 21 #include "ui/views/test/menu_test_utils.h" |
21 #include "ui/views/test/test_views.h" | 22 #include "ui/views/test/test_views.h" |
(...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
370 menu_runner->OnMenuClosed(internal::MenuControllerDelegate::NOTIFY_DELEGATE, | 371 menu_runner->OnMenuClosed(internal::MenuControllerDelegate::NOTIFY_DELEGATE, |
371 nullptr, 0); | 372 nullptr, 0); |
372 | 373 |
373 // This should not access the destroyed MenuController | 374 // This should not access the destroyed MenuController |
374 menu_runner2->Release(); | 375 menu_runner2->Release(); |
375 menu_runner->Release(); | 376 menu_runner->Release(); |
376 } | 377 } |
377 | 378 |
378 } // namespace test | 379 } // namespace test |
379 } // namespace views | 380 } // namespace views |
OLD | NEW |