content/public/browser/android/compositor.h - Issue 755643004: Replace SystemUIResourceManager with ResourceManager

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 755643004: Replace SystemUIResourceManager with ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix clang build failure Created 6 years 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

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/UIResources.java ('k') | content/public/browser/android/ui_resource_client_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/browser/android/compositor.h

diff --git a/content/public/browser/android/compositor.h b/content/public/browser/android/compositor.h

index e7dd30e23fa52cc3201ea8678872e7c1bf7e3ea3..e79a1b96238a471bdddbccd68f6b58d9f227b1bf 100644

--- a/content/public/browser/android/compositor.h

+++ b/content/public/browser/android/compositor.h

@@ -8,7 +8,7 @@

#include "base/callback.h"

#include "cc/resources/ui_resource_bitmap.h"

#include "content/common/content_export.h"

-#include "content/public/browser/android/ui_resource_provider.h"

+#include "ui/android/resources/ui_resource_provider.h"

#include "ui/gfx/native_widget_types.h"

#include "ui/gfx/rect.h"

#include "ui/gfx/size.h"

@@ -25,11 +25,11 @@ class JavaBitmap;

namespace ui {

class ResourceManager;

+class UIResourceProvider;

}

namespace content {

class CompositorClient;

-class UIResourceProvider;

// An interface to the browser-side compositor.

class CONTENT_EXPORT Compositor {

@@ -70,7 +70,7 @@ class CONTENT_EXPORT Compositor {

virtual void SetNeedsComposite() = 0;

// Returns the UI resource provider associated with the compositor.

- virtual UIResourceProvider& GetUIResourceProvider() = 0;

+ virtual ui::UIResourceProvider& GetUIResourceProvider() = 0;

// Returns the resource manager associated with the compositor.

virtual ui::ResourceManager& GetResourceManager() = 0;