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

Unified Diff: content/browser/android/system_ui_resource_manager_impl.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: Code review 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
Index: content/browser/android/system_ui_resource_manager_impl.h
diff --git a/content/browser/android/system_ui_resource_manager_impl.h b/content/browser/android/system_ui_resource_manager_impl.h
index 54b2bd39d957f4c40ae88b2240214f5df1e7145e..493949cee301d2b30375f3c496ce445b114ff9c8 100644
--- a/content/browser/android/system_ui_resource_manager_impl.h
+++ b/content/browser/android/system_ui_resource_manager_impl.h
@@ -5,6 +5,7 @@
#ifndef CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_
#define CONTENT_BROWSER_ANDROID_SYSTEM_UI_RESOURCE_MANAGER_IMPL_H_
+#include "base/android/jni_android.h"
#include "base/basictypes.h"
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/memory/weak_ptr.h"
@@ -26,22 +27,24 @@ class CONTENT_EXPORT SystemUIResourceManagerImpl
public:
explicit SystemUIResourceManagerImpl(
UIResourceProvider* ui_resource_provider);
- virtual ~SystemUIResourceManagerImpl();
+ ~SystemUIResourceManagerImpl() override;
- virtual void PreloadResource(ResourceType type) override;
- virtual cc::UIResourceId GetUIResourceId(ResourceType type) override;
+ void PreloadResource(ui::SystemUIResourceType type) override;
+ cc::UIResourceId GetUIResourceId(ui::SystemUIResourceType type) override;
+
+ static bool RegisterUIResources(JNIEnv* env);
private:
friend class TestSystemUIResourceManagerImpl;
class Entry;
// Start loading the resource bitmap. virtual for testing.
- virtual void BuildResource(ResourceType type);
+ virtual void BuildResource(ui::SystemUIResourceType type);
- Entry* GetEntry(ResourceType type);
- void OnFinishedLoadBitmap(ResourceType, SkBitmap* bitmap_holder);
+ Entry* GetEntry(ui::SystemUIResourceType type);
+ void OnFinishedLoadBitmap(ui::SystemUIResourceType, SkBitmap* bitmap_holder);
- scoped_ptr<Entry> resource_map_[RESOURCE_TYPE_LAST + 1];
+ scoped_ptr<Entry> resource_map_[ui::SYSTEM_UI_RESOURCE_TYPE_LAST + 1];
UIResourceProvider* ui_resource_provider_;
base::WeakPtrFactory<SystemUIResourceManagerImpl> weak_factory_;

Powered by Google App Engine
This is Rietveld 408576698