Upstream ResourceManager

ui/android/resources/ui_resource_android.h

Index: ui/android/resources/ui_resource_android.h
diff --git a/ui/android/resources/ui_resource_android.h b/ui/android/resources/ui_resource_android.h
new file mode 100644
index 0000000000000000000000000000000000000000..d32387ba52fe4a513ae830bdf505a2125919cded
--- /dev/null
+++ b/ui/android/resources/ui_resource_android.h
@@ -0,0 +1,53 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_
+#define UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_
+
+#include "base/basictypes.h"
+#include "cc/resources/ui_resource_bitmap.h"
+#include "content/public/browser/android/ui_resource_client_android.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/android/resources/ui_resource_android.h"
+#include "ui/android/ui_android_export.h"
+#include "ui/gfx/android/java_bitmap.h"
+
+namespace ui {
+
+class UI_ANDROID_EXPORT UIResourceAndroid
+    : public content::UIResourceClientAndroid {
+ public:
+  static scoped_ptr<UIResourceAndroid> CreateFromJavaBitmap(
+      content::UIResourceProvider* provider,
+      jobject bitmap_object);
+
+  static scoped_ptr<UIResourceAndroid> CreateFromJavaBitmap(
+      content::UIResourceProvider* provider,
+      const gfx::JavaBitmap& java_bitmap);
+
+  virtual ~UIResourceAndroid() override;

[no sievers, 2014/12/02 00:25:06]

nit: no 'virtual' if 'override'

[Jaekyun Seok (inactive), 2014/12/02 03:13:13]

Done.

+
+  // cc::UIResourceClient implementation.
+  cc::UIResourceBitmap GetBitmap(cc::UIResourceId uid,
+                                 bool resource_lost) override;
+
+  // UIResourceClientAndroid implementation.
+  void UIResourceIsInvalid() override;
+
+  cc::UIResourceId id();
+
+ private:
+  UIResourceAndroid(content::UIResourceProvider* provider,
+                    const SkBitmap& skbitmap);
+
+  content::UIResourceProvider* provider_;
+  SkBitmap bitmap_;
+  cc::UIResourceId id_;
+
+  DISALLOW_COPY_AND_ASSIGN(UIResourceAndroid);
+};
+
+}  // namespace ui
+
+#endif  // UI_ANDROID_RESOURCES_UI_RESOURCE_ANDROID_H_