ui/views/test/combobox_test_api.cc - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/views/test/combobox_test_api.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/views/test/combobox_test_api.cc

diff --git a/ui/views/test/combobox_test_api.cc b/ui/views/test/combobox_test_api.cc

index 5a897be909e8f3f7a1e326ead3c253f333441958..088885f74c52af520231a78052fadf657f29929e 100644

--- a/ui/views/test/combobox_test_api.cc

+++ b/ui/views/test/combobox_test_api.cc

@@ -7,6 +7,7 @@

#include <stdint.h>

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "ui/base/models/menu_model.h"

#include "ui/views/controls/combobox/combobox.h"

#include "ui/views/controls/menu/menu_runner.h"

@@ -50,7 +51,7 @@ void ComboboxTestApi::InstallTestMenuRunner(int* menu_show_count) {

new MenuRunner(menu_model(), MenuRunner::COMBOBOX));

test::MenuRunnerTestAPI test_api(combobox_->menu_runner_.get());

test_api.SetMenuRunnerHandler(

- make_scoped_ptr(new TestMenuRunnerHandler(menu_show_count)));

+ base::WrapUnique(new TestMenuRunnerHandler(menu_show_count)));

}

gfx::Size ComboboxTestApi::content_size() {

« no previous file with comments | « ui/views/style/platform_style_mac.mm ('k') | ui/views/test/default_platform_test_helper.cc » ('j') | no next file with comments »