chrome/browser/ui/bookmarks/bookmark_context_menu_controller.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/bookmarks/bookmark_context_menu_controller.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/autofill/save_card_bubble_controller_impl_unittest.cc ('k') | chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h

diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h

index f1e02d1945e73d3d4fb14bc6db5e4760077291bd..274cdd0a28162f2c755219ff0e8d684b1b74397e 100644

--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h

+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h

@@ -5,10 +5,10 @@

#ifndef CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_

#define CHROME_BROWSER_UI_BOOKMARKS_BOOKMARK_CONTEXT_MENU_CONTROLLER_H_

+#include <memory>

#include <vector>

#include "base/macros.h"

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

#include "base/memory/weak_ptr.h"

#include "components/bookmarks/browser/base_bookmark_model_observer.h"

#include "ui/base/models/simple_menu_model.h"

@@ -99,7 +99,7 @@ class BookmarkContextMenuController

const bookmarks::BookmarkNode* parent_;

std::vector<const bookmarks::BookmarkNode*> selection_;

bookmarks::BookmarkModel* model_;

- scoped_ptr<ui::SimpleMenuModel> menu_model_;

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

// Used to detect deletion of |this| executing a command.

base::WeakPtrFactory<BookmarkContextMenuController> weak_factory_;