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

Index: chrome/browser/ui/views/content_setting_bubble_contents.h

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

index 46689f1240006563b52ae2718f149850d4dcf95c..9e36332b38cbfa7eb32d53cb3ee7d5f15d0fea0f 100644

--- a/chrome/browser/ui/views/content_setting_bubble_contents.h

+++ b/chrome/browser/ui/views/content_setting_bubble_contents.h

@@ -101,7 +101,7 @@ class ContentSettingBubbleContents : public content::WebContentsObserver,

void UpdateMenuButtonSizes();

// Provides data for this bubble.

- scoped_ptr<ContentSettingBubbleModel> content_setting_bubble_model_;

+ std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model_;

// Some of our controls, so we can tell what's been clicked when we get a

// message.

@@ -112,7 +112,7 @@ class ContentSettingBubbleContents : public content::WebContentsObserver,

views::Link* manage_link_;

views::Link* learn_more_link_;

views::LabelButton* close_button_;

- scoped_ptr<views::MenuRunner> menu_runner_;

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

MediaMenuPartsMap media_menus_;

DISALLOW_IMPLICIT_CONSTRUCTORS(ContentSettingBubbleContents);