ui/views/controls/button/custom_button.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/controls/button/custom_button.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/controls/button/custom_button.h

diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h

index 05840e0b2dd7a2463c78a0f35a1605990b89e43f..d3fbdfa214a281ce7862cf758ce6caee1f7f5c98 100644

--- a/ui/views/controls/button/custom_button.h

+++ b/ui/views/controls/button/custom_button.h

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

#ifndef UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_

#define UI_VIEWS_CONTROLS_BUTTON_CUSTOM_BUTTON_H_

+#include <memory>

#include "base/macros.h"

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

#include "ui/events/event_constants.h"

#include "ui/gfx/animation/animation_delegate.h"

#include "ui/gfx/animation/throb_animation.h"

@@ -100,7 +101,7 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {

void OnDragDone() override;

void GetAccessibleState(ui::AXViewState* state) override;

void VisibilityChanged(View* starting_from, bool is_visible) override;

- scoped_ptr<InkDropHover> CreateInkDropHover() const override;

+ std::unique_ptr<InkDropHover> CreateInkDropHover() const override;

SkColor GetInkDropBaseColor() const override;

// Overridden from gfx::AnimationDelegate:

« no previous file with comments | « ui/views/controls/button/checkbox.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »