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 #include "content/browser/android/overscroll_controller_android.h" | 5 #include "content/browser/android/overscroll_controller_android.h" |
6 | 6 |
7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
10 #include "cc/layers/layer.h" | 10 #include "cc/layers/layer.h" |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 new EdgeEffect(resource_manager, dpi_scale)); | 75 new EdgeEffect(resource_manager, dpi_scale)); |
76 } | 76 } |
77 | 77 |
78 std::unique_ptr<OverscrollGlow> CreateGlowEffect(OverscrollGlowClient* client, | 78 std::unique_ptr<OverscrollGlow> CreateGlowEffect(OverscrollGlowClient* client, |
79 float dpi_scale) { | 79 float dpi_scale) { |
80 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 80 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
81 switches::kDisableOverscrollEdgeEffect)) { | 81 switches::kDisableOverscrollEdgeEffect)) { |
82 return nullptr; | 82 return nullptr; |
83 } | 83 } |
84 | 84 |
85 return base::WrapUnique(new OverscrollGlow(client)); | 85 return base::MakeUnique<OverscrollGlow>(client); |
86 } | 86 } |
87 | 87 |
88 std::unique_ptr<OverscrollRefresh> CreateRefreshEffect( | 88 std::unique_ptr<OverscrollRefresh> CreateRefreshEffect( |
89 OverscrollRefreshHandler* handler) { | 89 OverscrollRefreshHandler* handler) { |
90 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 90 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
91 switches::kDisablePullToRefreshEffect)) { | 91 switches::kDisablePullToRefreshEffect)) { |
92 return nullptr; | 92 return nullptr; |
93 } | 93 } |
94 | 94 |
95 return base::WrapUnique(new OverscrollRefresh(handler)); | 95 return base::MakeUnique<OverscrollRefresh>(handler); |
96 } | 96 } |
97 | 97 |
98 } // namespace | 98 } // namespace |
99 | 99 |
100 OverscrollControllerAndroid::OverscrollControllerAndroid( | 100 OverscrollControllerAndroid::OverscrollControllerAndroid( |
101 ContentViewCoreImpl* content_view_core, | 101 ContentViewCoreImpl* content_view_core, |
102 float dpi_scale) | 102 float dpi_scale) |
103 : compositor_(content_view_core->GetWindowAndroid()->GetCompositor()), | 103 : compositor_(content_view_core->GetWindowAndroid()->GetCompositor()), |
104 dpi_scale_(dpi_scale), | 104 dpi_scale_(dpi_scale), |
105 enabled_(true), | 105 enabled_(true), |
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
274 std::unique_ptr<EdgeEffectBase> | 274 std::unique_ptr<EdgeEffectBase> |
275 OverscrollControllerAndroid::CreateEdgeEffect() { | 275 OverscrollControllerAndroid::CreateEdgeEffect() { |
276 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); | 276 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_); |
277 } | 277 } |
278 | 278 |
279 void OverscrollControllerAndroid::SetNeedsAnimate() { | 279 void OverscrollControllerAndroid::SetNeedsAnimate() { |
280 compositor_->SetNeedsAnimate(); | 280 compositor_->SetNeedsAnimate(); |
281 } | 281 } |
282 | 282 |
283 } // namespace content | 283 } // namespace content |
OLD | NEW |