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 #include "base/callback.h" | 5 #include "base/callback.h" |
6 #include "base/location.h" | 6 #include "base/location.h" |
7 #include "base/macros.h" | 7 #include "base/macros.h" |
8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/thread_task_runner_handle.h" | 10 #include "base/thread_task_runner_handle.h" |
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
266 view, | 266 view, |
267 ui_controls::LEFT, | 267 ui_controls::LEFT, |
268 ui_controls::DOWN | ui_controls::UP, | 268 ui_controls::DOWN | ui_controls::UP, |
269 next); | 269 next); |
270 } | 270 } |
271 | 271 |
272 views::MenuButton* button_; | 272 views::MenuButton* button_; |
273 TopMenuModel top_menu_model_; | 273 TopMenuModel top_menu_model_; |
274 views::MenuModelAdapter menu_model_adapter_; | 274 views::MenuModelAdapter menu_model_adapter_; |
275 views::MenuItemView* menu_; | 275 views::MenuItemView* menu_; |
276 scoped_ptr<views::MenuRunner> menu_runner_; | 276 std::unique_ptr<views::MenuRunner> menu_runner_; |
277 }; | 277 }; |
278 | 278 |
279 // If this flakes, disable and log details in http://crbug.com/523255. | 279 // If this flakes, disable and log details in http://crbug.com/523255. |
280 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) | 280 VIEW_TEST(MenuModelAdapterTest, RebuildMenu) |
OLD | NEW |