chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.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/views/apps/chrome_native_app_window_views_aura_ash.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/views/apps/chrome_native_app_window_views_aura_ash.h ('k') | chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

index b18355e50c4059e0246acfb82b5be5c391c4af09..d36f4ef3504aa47a8bcb843e81b35b0a0f72b8c4 100644

--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.cc

@@ -223,7 +223,7 @@ void ChromeNativeAppWindowViewsAuraAsh::ShowContextMenuForView(

views::View* source,

const gfx::Point& p,

ui::MenuSourceType source_type) {

- scoped_ptr<ui::MenuModel> model =

+ std::unique_ptr<ui::MenuModel> model =

CreateMultiUserContextMenu(app_window()->GetNativeWindow());

if (!model.get())

return;

@@ -253,8 +253,8 @@ ChromeNativeAppWindowViewsAuraAsh::CreateNonClientFrameView(

// Set the delegate now because CustomFrameViewAsh sets the

// WindowStateDelegate if one is not already set.

ash::wm::GetWindowState(GetNativeWindow())

- ->SetDelegate(scoped_ptr<ash::wm::WindowStateDelegate>(

- new NativeAppWindowStateDelegate(app_window(), this)));

+ ->SetDelegate(std::unique_ptr<ash::wm::WindowStateDelegate>(

+ new NativeAppWindowStateDelegate(app_window(), this)));

if (IsFrameless())

return CreateNonStandardAppFrame();