ui/views/bubble/bubble_border.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/views/bubble/bubble_border.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/views/bubble/bubble_border.h

diff --git a/ui/views/bubble/bubble_border.h b/ui/views/bubble/bubble_border.h

index 057459f2539293e1bbacbc4792a55d57a17d715d..2ebdf9c6156f842ec77a22cc65474d207c45e16d 100644

--- a/ui/views/bubble/bubble_border.h

+++ b/ui/views/bubble/bubble_border.h

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

#ifndef UI_VIEWS_BUBBLE_BUBBLE_BORDER_H_

#define UI_VIEWS_BUBBLE_BUBBLE_BORDER_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/gtest_prod_util.h"

#include "base/macros.h"

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

#include "ui/gfx/image/image_skia.h"

#include "ui/views/background.h"

#include "ui/views/border.h"

@@ -34,7 +35,7 @@ struct BorderImages {

int corner_radius);

virtual ~BorderImages();

- scoped_ptr<Painter> border_painter;

+ std::unique_ptr<Painter> border_painter;

gfx::ImageSkia left_arrow;

gfx::ImageSkia top_arrow;

gfx::ImageSkia right_arrow;

« no previous file with comments | « ui/views/border.cc ('k') | ui/views/bubble/bubble_border_unittest.cc » ('j') | no next file with comments »