chrome/browser/ui/views/profiles/avatar_menu_button.h - 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/profiles/avatar_menu_button.h

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

Index: chrome/browser/ui/views/profiles/avatar_menu_button.h

diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button.h b/chrome/browser/ui/views/profiles/avatar_menu_button.h

index ced141138687731bb15a9e37d19456793464f649..e28af06fe77721bd310b17476f70cc8fb9fd7d59 100644

--- a/chrome/browser/ui/views/profiles/avatar_menu_button.h

+++ b/chrome/browser/ui/views/profiles/avatar_menu_button.h

@@ -70,10 +70,10 @@ class AvatarMenuButton : public views::MenuButton,

BrowserView* browser_view_;

bool enabled_;

- scoped_ptr<ui::MenuModel> menu_model_;

+ std::unique_ptr<ui::MenuModel> menu_model_;

// Use a scoped ptr because gfx::Image doesn't have a default constructor.

- scoped_ptr<gfx::Image> icon_;

+ std::unique_ptr<gfx::Image> icon_;

gfx::ImageSkia button_icon_;

bool is_rectangle_;

int old_height_;