content/browser/android/ui_resource_provider_impl.h - Issue 454113002: Revert of Revert of [Android] Use UIResource for overscroll glow

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/ui_resource_provider_impl.h

Issue 454113002: Revert of Revert of [Android] Use UIResource for overscroll glow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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/system_ui_resource_manager_impl_unittest.cc ('k') | content/browser/android/ui_resource_provider_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/android/ui_resource_provider_impl.h

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

index 79c23014d2d3735554d68a447ca7e44cc500617c..57c9ab86d80de39472528be4828ca637c788d5eb 100644

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

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

@@ -6,6 +6,7 @@

#define CONTENT_BROWSER_ANDROID_UI_RESOURCE_PROVIDER_IMPL_H_

#include "base/containers/hash_tables.h"

+#include "content/browser/android/system_ui_resource_manager_impl.h"

#include "content/public/browser/android/ui_resource_provider.h"

namespace cc {

@@ -31,11 +32,13 @@

virtual void DeleteUIResource(cc::UIResourceId resource_id) OVERRIDE;

+ ui::SystemUIResourceManager& GetSystemUIResourceManager();

private:

typedef base::hash_map<cc::UIResourceId, UIResourceClientAndroid*>

UIResourceClientMap;

UIResourceClientMap ui_resource_client_map_;

+ SystemUIResourceManagerImpl system_ui_resource_manager_;

cc::LayerTreeHost* host_;

DISALLOW_COPY_AND_ASSIGN(UIResourceProviderImpl);