Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(148)

Side by Side Diff: chrome/browser/ui/views/menu_model_adapter_test.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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)
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc ('k') | chrome/browser/ui/views/menu_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698