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

Unified Diff: content/public/browser/android/compositor.h

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Apply David's comments 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/public/browser/android/compositor.h
diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h
index 25a61c88aecad8ef2d6fab370fb201c25faa0985..3895cd7b8c4e7232c5ce54e6dcee58df4e93d11b 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"
#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;
jdduke (slow) 2014/11/19 00:09:15 dtrainor@: So eventually we'll call this, and get
+
protected:
Compositor() {}
};

Powered by Google App Engine
This is Rietveld 408576698