Upstream ResourceManager

content/public/browser/android/compositor.h

Index: content/public/browser/android/compositor.h
diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h
index 25a61c88aecad8ef2d6fab370fb201c25faa0985..48ad365d3e40181cbef22264c69a0d7337d8bb33 100644
--- a/content/public/browser/android/compositor.h
+++ b/content/public/browser/android/compositor.h
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "cc/resources/ui_resource_bitmap.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/android/resource_manager.h"

[jdduke (slow), 2014/11/19 18:26:48]

Do we need this include if we forward declare the class?

[Jaekyun Seok (inactive), 2014/11/21 12:35:33]

Done.

 #include "content/public/browser/android/ui_resource_provider.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect.h"
@@ -25,6 +26,7 @@ class JavaBitmap;
 
 namespace content {
 class CompositorClient;
+class ResourceManager;
 class UIResourceProvider;
 
 // An interface to the browser-side compositor.
@@ -68,6 +70,9 @@ class CONTENT_EXPORT Compositor {
   // Returns the UI resource provider associated with the compositor.
   virtual UIResourceProvider& GetUIResourceProvider() = 0;
 
+  // Returns the resource manager associated with the compositor.
+  virtual ResourceManager& GetResourceManager() = 0;
+
  protected:
   Compositor() {}
 };