content/browser/android/overscroll_controller_android.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: content/browser/android/overscroll_controller_android.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 unified diff | Download patch

« no previous file with comments | « components/wallpaper/wallpaper_resizer_unittest.cc ('k') | content/browser/android/popup_touch_handle_drawable.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_	5 #ifndef CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_

6 #define CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_	6 #define CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_

7	7

	8 #include <memory>

	9

8 #include "base/macros.h"	10 #include "base/macros.h"

9 #include "base/time/time.h"	11 #include "base/time/time.h"

10 #include "content/common/input/input_event_ack_state.h"	12 #include "content/common/input/input_event_ack_state.h"

11 #include "ui/android/overscroll_glow.h"	13 #include "ui/android/overscroll_glow.h"

12 #include "ui/android/overscroll_refresh.h"	14 #include "ui/android/overscroll_refresh.h"

13 #include "ui/gfx/geometry/vector2d_f.h"	15 #include "ui/gfx/geometry/vector2d_f.h"

14	16

15 namespace blink {	17 namespace blink {

16 class WebGestureEvent;	18 class WebGestureEvent;

17 }	19 }

(...skipping 57 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 // TODO(jdduke): Factor out a common API from the two overscroll effects.	77 // TODO(jdduke): Factor out a common API from the two overscroll effects.

76 std::unique_ptr<ui::OverscrollGlow> glow_effect_;	78 std::unique_ptr<ui::OverscrollGlow> glow_effect_;

77 std::unique_ptr<ui::OverscrollRefresh> refresh_effect_;	79 std::unique_ptr<ui::OverscrollRefresh> refresh_effect_;

78	80

79 DISALLOW_COPY_AND_ASSIGN(OverscrollControllerAndroid);	81 DISALLOW_COPY_AND_ASSIGN(OverscrollControllerAndroid);

80 };	82 };

81	83

82 } // namespace content	84 } // namespace content

83	85

84 #endif // CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_	86 #endif // CONTENT_BROWSER_ANDROID_OVERSCROLL_CONTROLLER_ANDROID_H_

OLD	NEW