Replace SystemUIResourceManager with ResourceManager

ui/android/resources/resource_manager.h

Index: ui/android/resources/resource_manager.h
diff --git a/ui/android/resources/resource_manager.h b/ui/android/resources/resource_manager.h
index 730d4dc5afcf594d58527a768207bc3c249c3fea..b9e2e353dd79b0b563f325505325e5c54217318c 100644
--- a/ui/android/resources/resource_manager.h
+++ b/ui/android/resources/resource_manager.h
@@ -5,19 +5,19 @@
 #ifndef UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
 #define UI_ANDROID_RESOURCES_RESOURCE_MANAGER_H_
 
+#include <string>
+
 #include "base/android/jni_android.h"
 #include "base/id_map.h"
 #include "cc/resources/ui_resource_client.h"
 #include "ui/android/ui_android_export.h"
+#include "ui/base/android/system_ui_resource_manager.h"
 #include "ui/gfx/geometry/rect.h"
 
-namespace content {
-class UIResourceProvider;
-}
-
 namespace ui {
 
 class UIResourceAndroid;
+class UIResourceProvider;
 
 // A Java counterpart will be generated for this enum.
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.ui.resources
@@ -32,7 +32,7 @@ enum AndroidResourceType {
   ANDROID_RESOURCE_TYPE_LAST = ANDROID_RESOURCE_TYPE_SYSTEM,
 };
 
-class UI_ANDROID_EXPORT ResourceManager {
+class UI_ANDROID_EXPORT ResourceManager : public ui::SystemUIResourceManager {
  public:
   struct Resource {
    public:
@@ -49,14 +49,21 @@ class UI_ANDROID_EXPORT ResourceManager {
 
   static ResourceManager* FromJavaObject(jobject jobj);
 
-  explicit ResourceManager(content::UIResourceProvider* ui_resource_provider);
-  virtual ~ResourceManager();
+  explicit ResourceManager(ui::UIResourceProvider* ui_resource_provider);
+  ~ResourceManager() override;
+
+  // ui::SystemUIResourceManager implementation.
+  void PreloadResource(ui::SystemUIResourceType type) override;

[jdduke (slow), 2014/12/08 16:23:13]

Can we just get rid of the SystemUIResourceManager interface entirely?

[Jaekyun Seok (inactive), 2014/12/09 11:42:35]

I want to keep the SystemUIResourceManager interface because it is being exposed
in ui/base/android/window_android_compositor.h .

+  cc::UIResourceId GetUIResourceId(ui::SystemUIResourceType type) override;
 
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject(JNIEnv* env);
 
   ResourceManager::Resource* GetResource(AndroidResourceType res_type,
                                          int res_id);
+  ResourceManager::Resource* GetResource(AndroidResourceType res_type,

[jdduke (slow), 2014/12/08 16:23:13]

Where are these methods that take a string used? I would *much* prefer we don't
take a string argument anywhere here, and certainly not a string *by value* (see
https://groups.google.com/a/chromium.org/forum/#!msg/chromium-dev/EUqoIz2iFU4...).

If necessary, we could expose the |int
GetAndroidResourceIdFromString(std::string res_name) method|, so the caller can
cache the id just once. But I still would like to know where these methods are
called.

[Jaekyun Seok (inactive), 2014/12/09 11:42:35]

This was requested from David.

David, could you please answer to these comments?

+                                         std::string res_name);
   void PreloadResource(AndroidResourceType res_type, int res_id);
+  void PreloadResource(AndroidResourceType res_type, std::string res_name);
 
   // Called from Java ----------------------------------------------------------
   void OnResourceReady(JNIEnv* env,
@@ -76,12 +83,15 @@ class UI_ANDROID_EXPORT ResourceManager {
   static bool RegisterResourceManager(JNIEnv* env);
 
  private:
+  int GetAndroidResourceIdFromString(std::string res_name);
+
   typedef IDMap<Resource, IDMapOwnPointer> ResourceMap;
 
-  content::UIResourceProvider* ui_resource_provider_;
+  ui::UIResourceProvider* ui_resource_provider_;
   ResourceMap resources_[ANDROID_RESOURCE_TYPE_COUNT];
 
   base::android::ScopedJavaGlobalRef<jobject> java_obj_;
+  base::hash_map<std::string, int> android_res_name_to_res_id_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceManager);
 };