content/browser/android/overscroll_controller_android.h - Issue 1874893002: Convert //content/browser 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: content/browser/android/overscroll_controller_android.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 | « content/browser/android/java/java_type_unittest.cc ('k') | content/browser/android/overscroll_controller_android.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/overscroll_controller_android.h

diff --git a/content/browser/android/overscroll_controller_android.h b/content/browser/android/overscroll_controller_android.h

index 73c1b769bc1ac4cf16eb7ae57c73ae7c3c88e213..3d91cb0a9d8816bef0032818ac87f9de7d411af0 100644

--- a/content/browser/android/overscroll_controller_android.h

+++ b/content/browser/android/overscroll_controller_android.h

@@ -63,7 +63,7 @@ class OverscrollControllerAndroid : public ui::OverscrollGlowClient {

private:

// OverscrollGlowClient implementation.

- scoped_ptr<ui::EdgeEffectBase> CreateEdgeEffect() override;

+ std::unique_ptr<ui::EdgeEffectBase> CreateEdgeEffect() override;

void SetNeedsAnimate();

@@ -73,8 +73,8 @@ class OverscrollControllerAndroid : public ui::OverscrollGlowClient {

bool enabled_;

// TODO(jdduke): Factor out a common API from the two overscroll effects.

- scoped_ptr<ui::OverscrollGlow> glow_effect_;

- scoped_ptr<ui::OverscrollRefresh> refresh_effect_;

+ std::unique_ptr<ui::OverscrollGlow> glow_effect_;

+ std::unique_ptr<ui::OverscrollRefresh> refresh_effect_;

DISALLOW_COPY_AND_ASSIGN(OverscrollControllerAndroid);

};

« no previous file with comments | « content/browser/android/java/java_type_unittest.cc ('k') | content/browser/android/overscroll_controller_android.cc » ('j') | no next file with comments »