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

Index: chrome/browser/ui/extensions/icon_with_badge_image_source.h

diff --git a/chrome/browser/ui/extensions/icon_with_badge_image_source.h b/chrome/browser/ui/extensions/icon_with_badge_image_source.h

index c119eba626070844ce75b7f73da0c09defbaebc1..d4fa40295f26695174c92f680c3df51ecd78f39a 100644

--- a/chrome/browser/ui/extensions/icon_with_badge_image_source.h

+++ b/chrome/browser/ui/extensions/icon_with_badge_image_source.h

@@ -38,7 +38,7 @@ class IconWithBadgeImageSource : public gfx::CanvasImageSource {

~IconWithBadgeImageSource() override;

void SetIcon(const gfx::Image& icon);

- void SetBadge(scoped_ptr<Badge> badge);

+ void SetBadge(std::unique_ptr<Badge> badge);

void set_grayscale(bool grayscale) { grayscale_ = grayscale; }

void set_paint_page_action_decoration(bool should_paint) {

paint_page_action_decoration_ = should_paint;

@@ -74,7 +74,7 @@ class IconWithBadgeImageSource : public gfx::CanvasImageSource {

gfx::Image icon_;

// An optional badge to draw over the base icon.

- scoped_ptr<Badge> badge_;

+ std::unique_ptr<Badge> badge_;

// Whether or not the icon should be grayscaled (e.g., to show it is

// disabled).