content/browser/android/overscroll_refresh.cc - Issue 755643004: Replace SystemUIResourceManager with ResourceManager

Unified Diff: content/browser/android/overscroll_refresh.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 side-by-side diff with in-line comments

Download patch

« content/browser/android/edge_effect_l.cc ('K') | « content/browser/android/overscroll_refresh.h ('k') | content/browser/android/overscroll_refresh_unittest.cc » ('j') | ui/android/java/src/org/chromium/ui/resources/system/SystemResourceLoader.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/overscroll_refresh.cc

diff --git a/content/browser/android/overscroll_refresh.cc b/content/browser/android/overscroll_refresh.cc

index 6d0ed1671e9d3861471fc0a48fbf4cab55721a26..3ddfe7c5dc6cf4e36f411951ef4e2545b2d48251 100644

--- a/content/browser/android/overscroll_refresh.cc

+++ b/content/browser/android/overscroll_refresh.cc

@@ -8,7 +8,7 @@

#include "cc/layers/ui_resource_layer.h"

#include "cc/trees/layer_tree_host.h"

#include "content/browser/android/animation_utils.h"

-#include "ui/base/android/system_ui_resource_manager.h"

+#include "ui/android/resources/resource_manager.h"

#include "ui/gfx/geometry/size_conversions.h"

using std::abs;

@@ -105,7 +105,7 @@ void UpdateLayer(cc::UIResourceLayer* layer,

class OverscrollRefresh::Effect {

public:

- Effect(ui::SystemUIResourceManager* resource_manager, float target_drag)

+ Effect(ui::ResourceManager* resource_manager, float target_drag)

: resource_manager_(resource_manager),

idle_layer_(cc::UIResourceLayer::Create()),

active_layer_(cc::UIResourceLayer::Create()),

@@ -325,10 +325,10 @@ class OverscrollRefresh::Effect {

return;

}

- cc::UIResourceId idle_resource =

- resource_manager_->GetUIResourceId(kIdleResourceType);

- cc::UIResourceId active_resource =

- resource_manager_->GetUIResourceId(kActiveResourceType);

+ cc::UIResourceId idle_resource = resource_manager_->GetUIResourceId(

+ ui::ANDROID_RESOURCE_TYPE_SYSTEM, kIdleResourceType);

jdduke (slow) 2014/12/10 19:19:27 Same here, |kIdleResourceId| and |kActiveResourceI

Jaekyun Seok (inactive) 2014/12/10 21:42:38 Done.

+ cc::UIResourceId active_resource = resource_manager_->GetUIResourceId(

+ ui::ANDROID_RESOURCE_TYPE_SYSTEM, kActiveResourceType);

gfx::Size idle_size =

parent->layer_tree_host()->GetUIResourceSize(idle_resource);

@@ -367,7 +367,7 @@ class OverscrollRefresh::Effect {

active_layer_->RemoveFromParent();

}

- ui::SystemUIResourceManager* const resource_manager_;

+ ui::ResourceManager* const resource_manager_;

scoped_refptr<cc::UIResourceLayer> idle_layer_;

scoped_refptr<cc::UIResourceLayer> active_layer_;

@@ -403,10 +403,9 @@ class OverscrollRefresh::Effect {

DISALLOW_COPY_AND_ASSIGN(Effect);

};

-OverscrollRefresh::OverscrollRefresh(

- ui::SystemUIResourceManager* resource_manager,

- OverscrollRefreshClient* client,

- float target_drag_offset_pixels)

+OverscrollRefresh::OverscrollRefresh(ui::ResourceManager* resource_manager,

+ OverscrollRefreshClient* client,

+ float target_drag_offset_pixels)

: client_(client),

scrolled_to_top_(true),

scroll_consumption_state_(DISABLED),