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

Unified Diff: ui/base/android/system_ui_resource_manager.h

Issue 679493002: [Android] Add a native pull-to-refresh overscroll effect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix findbugs... Created 6 years, 1 month 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 | « ui/base/BUILD.gn ('k') | ui/base/android/system_ui_resource_type.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/android/system_ui_resource_manager.h
diff --git a/ui/base/android/system_ui_resource_manager.h b/ui/base/android/system_ui_resource_manager.h
index e1b2edfaf8fc7de86c1a451128bf55cb497a8be3..81764dcec2d5e7aaf61b3344bda08e656c4e2f6e 100644
--- a/ui/base/android/system_ui_resource_manager.h
+++ b/ui/base/android/system_ui_resource_manager.h
@@ -6,6 +6,7 @@
#define UI_BASE_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_H_
#include "cc/resources/ui_resource_client.h"
+#include "ui/base/android/system_ui_resource_type.h"
#include "ui/base/ui_base_export.h"
namespace ui {
@@ -13,14 +14,6 @@ namespace ui {
// Interface for loading and accessing shared system UI resources.
class UI_BASE_EXPORT SystemUIResourceManager {
public:
- enum ResourceType {
- OVERSCROLL_EDGE = 0,
- OVERSCROLL_GLOW,
- OVERSCROLL_GLOW_L,
- RESOURCE_TYPE_FIRST = OVERSCROLL_EDGE,
- RESOURCE_TYPE_LAST = OVERSCROLL_GLOW_L
- };
-
virtual ~SystemUIResourceManager() {}
// Optionally trigger bitmap loading for a given |resource|, if necessary.
@@ -28,13 +21,13 @@ class UI_BASE_EXPORT SystemUIResourceManager {
// |GetUIResourceId()| will yield a valid result only after loading finishes.
// This method is particularly useful for idly loading a resource before an
// explicit cc::UIResourceId is required. Repeated calls will be ignored.
- virtual void PreloadResource(ResourceType resource) = 0;
+ virtual void PreloadResource(SystemUIResourceType resource) = 0;
// Return the resource id associated with |resource|. If loading hasn't yet
// begun for the given |resource|, it will be triggered immediately. If
// loading is asynchronous, 0 will be returned until loading has finished, and
// the caller is responsible for re-querying until a valid id is returned.
- virtual cc::UIResourceId GetUIResourceId(ResourceType resource) = 0;
+ virtual cc::UIResourceId GetUIResourceId(SystemUIResourceType resource) = 0;
};
} // namespace ui
« no previous file with comments | « ui/base/BUILD.gn ('k') | ui/base/android/system_ui_resource_type.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698