chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

index cc357013e0c8dace1fc1e915f62f6e0f7a6db203..c9a0381b6b85f559d6f7f856fd9263adfbbad8fe 100644

--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc

@@ -207,8 +207,9 @@ class LauncherPlatformAppBrowserTest

// Returns the number of menu items, ignoring separators.

int GetNumApplicationMenuItems(const ash::ShelfItem& item) {

const int event_flags = 0;

- scoped_ptr<ash::ShelfMenuModel> menu(new LauncherApplicationMenuItemModel(

- controller_->GetApplicationList(item, event_flags)));

+ std::unique_ptr<ash::ShelfMenuModel> menu(

+ new LauncherApplicationMenuItemModel(

+ controller_->GetApplicationList(item, event_flags)));

int num_items = 0;

for (int i = 0; i < menu->GetItemCount(); ++i) {

if (menu->GetTypeAt(i) != ui::MenuModel::TYPE_SEPARATOR)