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

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

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

index c23e3fb681b126bdc8c9f65d0828529e0df2e558..29a5aef31d365b37b9a9e3a438f96559d4bc8445 100644

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

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

@@ -5,8 +5,9 @@

#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_

#define CHROME_BROWSER_UI_VIEWS_FRAME_SYSTEM_MENU_MODEL_BUILDER_H_

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "chrome/browser/ui/views/frame/system_menu_model_delegate.h"

class Browser;

@@ -47,9 +48,9 @@ class SystemMenuModelBuilder {

void AppendTeleportMenu(ui::SimpleMenuModel* model);

SystemMenuModelDelegate menu_delegate_;

- scoped_ptr<ui::MenuModel> menu_model_;

- scoped_ptr<ZoomMenuModel> zoom_menu_contents_;

- scoped_ptr<EncodingMenuModel> encoding_menu_contents_;

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

+ std::unique_ptr<ZoomMenuModel> zoom_menu_contents_;

+ std::unique_ptr<EncodingMenuModel> encoding_menu_contents_;

DISALLOW_COPY_AND_ASSIGN(SystemMenuModelBuilder);

};