Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Side by Side Diff: content/browser/android/overscroll_controller_android.cc

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply Jared's comments Created 6 years 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
OLDNEW
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 "cc/layers/layer.h" 9 #include "cc/layers/layer.h"
10 #include "cc/output/compositor_frame_metadata.h" 10 #include "cc/output/compositor_frame_metadata.h"
11 #include "content/browser/android/edge_effect.h" 11 #include "content/browser/android/edge_effect.h"
12 #include "content/browser/android/edge_effect_l.h" 12 #include "content/browser/android/edge_effect_l.h"
13 #include "content/browser/web_contents/web_contents_impl.h" 13 #include "content/browser/web_contents/web_contents_impl.h"
14 #include "content/common/input/did_overscroll_params.h" 14 #include "content/common/input/did_overscroll_params.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "third_party/WebKit/public/web/WebInputEvent.h" 16 #include "third_party/WebKit/public/web/WebInputEvent.h"
17 #include "ui/android/resources/resource_manager.h"
17 #include "ui/base/android/window_android_compositor.h" 18 #include "ui/base/android/window_android_compositor.h"
18 19
19 namespace content { 20 namespace content {
20 namespace { 21 namespace {
21 22
22 // Used for conditional creation of EdgeEffect types for the overscroll glow. 23 // Used for conditional creation of EdgeEffect types for the overscroll glow.
23 const int kAndroidLSDKVersion = 21; 24 const int kAndroidLSDKVersion = 21;
24 25
25 // Default offset in dips from the top of the view beyond which the refresh 26 // Default offset in dips from the top of the view beyond which the refresh
26 // action will be activated. 27 // action will be activated.
27 const int kDefaultRefreshDragTargetDips = 64; 28 const int kDefaultRefreshDragTargetDips = 64;
28 29
29 scoped_ptr<EdgeEffectBase> CreateGlowEdgeEffect( 30 scoped_ptr<EdgeEffectBase> CreateGlowEdgeEffect(
30 ui::SystemUIResourceManager* resource_manager, 31 ui::ResourceManager* resource_manager,
31 float dpi_scale) { 32 float dpi_scale) {
32 DCHECK(resource_manager); 33 DCHECK(resource_manager);
33 static bool use_l_flavoured_effect = 34 static bool use_l_flavoured_effect =
34 base::android::BuildInfo::GetInstance()->sdk_int() >= kAndroidLSDKVersion; 35 base::android::BuildInfo::GetInstance()->sdk_int() >= kAndroidLSDKVersion;
35 if (use_l_flavoured_effect) 36 if (use_l_flavoured_effect)
36 return scoped_ptr<EdgeEffectBase>(new EdgeEffectL(resource_manager)); 37 return scoped_ptr<EdgeEffectBase>(new EdgeEffectL(resource_manager));
37 38
38 return scoped_ptr<EdgeEffectBase>( 39 return scoped_ptr<EdgeEffectBase>(
39 new EdgeEffect(resource_manager, dpi_scale)); 40 new EdgeEffect(resource_manager, dpi_scale));
40 } 41 }
(...skipping 11 matching lines...) Expand all
52 scoped_ptr<OverscrollRefresh> CreateRefreshEffect( 53 scoped_ptr<OverscrollRefresh> CreateRefreshEffect(
53 ui::WindowAndroidCompositor* compositor, 54 ui::WindowAndroidCompositor* compositor,
54 OverscrollRefreshClient* client, 55 OverscrollRefreshClient* client,
55 float dpi_scale) { 56 float dpi_scale) {
56 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 57 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
57 switches::kDisablePullToRefreshEffect)) { 58 switches::kDisablePullToRefreshEffect)) {
58 return nullptr; 59 return nullptr;
59 } 60 }
60 61
61 return make_scoped_ptr( 62 return make_scoped_ptr(
62 new OverscrollRefresh(&compositor->GetSystemUIResourceManager(), client, 63 new OverscrollRefresh(&compositor->GetResourceManager(), client,
63 kDefaultRefreshDragTargetDips * dpi_scale)); 64 kDefaultRefreshDragTargetDips * dpi_scale));
64 } 65 }
65 66
66 } // namespace 67 } // namespace
67 68
68 OverscrollControllerAndroid::OverscrollControllerAndroid( 69 OverscrollControllerAndroid::OverscrollControllerAndroid(
69 WebContents* web_contents, 70 WebContents* web_contents,
70 ui::WindowAndroidCompositor* compositor, 71 ui::WindowAndroidCompositor* compositor,
71 float dpi_scale) 72 float dpi_scale)
72 : compositor_(compositor), 73 : compositor_(compositor),
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 277
277 triggered_refresh_active_ = true; 278 triggered_refresh_active_ = true;
278 web_contents()->ReloadFocusedFrame(false); 279 web_contents()->ReloadFocusedFrame(false);
279 } 280 }
280 281
281 bool OverscrollControllerAndroid::IsStillRefreshing() const { 282 bool OverscrollControllerAndroid::IsStillRefreshing() const {
282 return triggered_refresh_active_; 283 return triggered_refresh_active_;
283 } 284 }
284 285
285 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() { 286 scoped_ptr<EdgeEffectBase> OverscrollControllerAndroid::CreateEdgeEffect() {
286 return CreateGlowEdgeEffect(&compositor_->GetSystemUIResourceManager(), 287 return CreateGlowEdgeEffect(&compositor_->GetResourceManager(), dpi_scale_);
287 dpi_scale_);
288 } 288 }
289 289
290 void OverscrollControllerAndroid::SetNeedsAnimate() { 290 void OverscrollControllerAndroid::SetNeedsAnimate() {
291 compositor_->SetNeedsAnimate(); 291 compositor_->SetNeedsAnimate();
292 } 292 }
293 293
294 } // namespace content 294 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698