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

Index: chrome/browser/ui/views/frame/browser_frame.h

diff --git a/chrome/browser/ui/views/frame/browser_frame.h b/chrome/browser/ui/views/frame/browser_frame.h

index 0034184825c392cbd5cb0e12e44a084f8da3f89b..aed98024c29d1d416f576cd19b9f4ba6a2d65d53 100644

--- a/chrome/browser/ui/views/frame/browser_frame.h

+++ b/chrome/browser/ui/views/frame/browser_frame.h

@@ -132,15 +132,15 @@ class BrowserFrame

// The BrowserView is our ClientView. This is a pointer to it.

BrowserView* browser_view_;

- scoped_ptr<SystemMenuModelBuilder> menu_model_builder_;

+ std::unique_ptr<SystemMenuModelBuilder> menu_model_builder_;

// Used to show the system menu. Only used if

// NativeBrowserFrame::UsesNativeSystemMenu() returns false.

- scoped_ptr<views::MenuRunner> menu_runner_;

+ std::unique_ptr<views::MenuRunner> menu_runner_;

const ThemeService* theme_service_;

- scoped_ptr<ui::EventHandler> browser_command_handler_;

+ std::unique_ptr<ui::EventHandler> browser_command_handler_;

DISALLOW_COPY_AND_ASSIGN(BrowserFrame);

};