content/browser/renderer_host/compositor_impl_android.cc - 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/browser/renderer_host/compositor_impl_android.cc

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

Patch Set: 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

« content/browser/android/system_ui_resource_manager_impl_unittest.cc ('K') | « content/browser/renderer_host/compositor_impl_android.h ('k') | content/content_browser.gypi » ('j') | ui/android/java/src/org/chromium/ui/resources/system/SystemResourceLoader.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/compositor_impl_android.cc

diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc

index ed4de23ca992f1936e0b39f329a463fe73535455..456f6041f2a5000a37cd7b8537e4f3e91379ac86 100644

--- a/content/browser/renderer_host/compositor_impl_android.cc

+++ b/content/browser/renderer_host/compositor_impl_android.cc

@@ -319,7 +319,7 @@ void CompositorImpl::Composite(CompositingTrigger trigger) {

root_window_->RequestVSyncUpdate();

}

-UIResourceProvider& CompositorImpl::GetUIResourceProvider() {

+ui::UIResourceProvider& CompositorImpl::GetUIResourceProvider() {

return ui_resource_provider_;

}

@@ -328,7 +328,7 @@ ui::ResourceManager& CompositorImpl::GetResourceManager() {

}

ui::SystemUIResourceManager& CompositorImpl::GetSystemUIResourceManager() {

- return ui_resource_provider_.GetSystemUIResourceManager();

+ return resource_manager_;

}

void CompositorImpl::SetRootLayer(scoped_refptr<cc::Layer> root_layer) {