ui/app_list/views/app_list_view.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/app_list/views/app_list_view.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/app_list/views/app_list_view.cc

diff --git a/ui/app_list/views/app_list_view.cc b/ui/app_list/views/app_list_view.cc

index ef4387bd1801a34e5bafb7a65b9a21ae047cc278..5c8258a6616f92b05689be41c9e1bdc1a9a15845 100644

--- a/ui/app_list/views/app_list_view.cc

+++ b/ui/app_list/views/app_list_view.cc

@@ -502,7 +502,7 @@ void AppListView::InitChildWidgets() {

#if defined(USE_AURA)

// Mouse events on the search box shadow should not be captured.

aura::Window* window = search_box_widget_->GetNativeWindow();

- window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(

+ window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(

new SearchBoxWindowTargeter(search_box_view_)));

#endif

@@ -553,7 +553,7 @@ void AppListView::InitAsBubbleInternal(gfx::NativeView parent,

GetBubbleFrameView()->set_background(new AppListBackground(

GetBubbleFrameView()->bubble_border()->GetBorderCornerRadius()));

set_background(NULL);

- window->SetEventTargeter(scoped_ptr<ui::EventTargeter>(

+ window->SetEventTargeter(std::unique_ptr<ui::EventTargeter>(

new views::BubbleWindowTargeter(this)));

#else

set_background(new AppListBackground(

« no previous file with comments | « ui/app_list/views/app_list_view.h ('k') | ui/app_list/views/app_list_view_unittest.cc » ('j') | no next file with comments »