chrome/browser/ui/cocoa/location_bar/content_setting_decoration.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/cocoa/location_bar/content_setting_decoration.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/cocoa/location_bar/autocomplete_text_field_editor_unittest.mm ('k') | chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h

diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h

index 4584b9a78cd069292d915e7a591aaf2901006f0e..e26d04bbdb5ddbcb585d9ad56b45e8d37f7f3095 100644

--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h

+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h

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

#ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_

#define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_CONTENT_SETTING_DECORATION_H_

+#include <memory>

#include "base/macros.h"

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

#import "chrome/browser/ui/cocoa/location_bar/image_decoration.h"

#include "components/content_settings/core/common/content_settings_types.h"

@@ -57,7 +58,7 @@ class ContentSettingDecoration : public ImageDecoration {

// Measure the width of the animated text.

CGFloat MeasureTextWidth();

- scoped_ptr<ContentSettingImageModel> content_setting_image_model_;

+ std::unique_ptr<ContentSettingImageModel> content_setting_image_model_;

LocationBarViewMac* owner_; // weak

Profile* profile_; // weak