content/content_browser.gypi - Issue 731133002: Upstream 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/content_browser.gypi

Issue 731133002: Upstream ResourceManager (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix build failure 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:

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 99acd2c4d9ddbfac7c3e6c3ac3a658a6185a8cbe..c2233c64f8cf749c5703aed442d30408a96b3c55 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -52,8 +52,10 @@

'public/browser/android/download_controller_android.h',

'public/browser/android/external_video_surface_container.h',

'public/browser/android/layer_tree_build_helper.h',

+ 'public/browser/android/resource_manager.h',

'public/browser/android/synchronous_compositor_client.h',

'public/browser/android/synchronous_compositor.h',

+ 'public/browser/android/ui_resource_android.h',

'public/browser/android/ui_resource_client_android.h',

'public/browser/android/ui_resource_provider.h',

'public/browser/appcache_service.h',

@@ -334,12 +336,16 @@

'browser/android/popup_item_type_list.h',

'browser/android/popup_touch_handle_drawable.cc',

'browser/android/popup_touch_handle_drawable.h',

+ 'browser/android/resource_manager_impl.cc',

+ 'browser/android/resource_manager_impl.h',

'browser/android/system_ui_resource_manager_impl.cc',

'browser/android/system_ui_resource_manager_impl.h',

'browser/android/tracing_controller_android.cc',

'browser/android/tracing_controller_android.h',

'browser/android/web_contents_observer_android.cc',

'browser/android/web_contents_observer_android.h',

+ 'browser/android/ui_resource_android_impl.cc',

+ 'browser/android/ui_resource_android_impl.h',

'browser/android/ui_resource_provider_impl.cc',

'browser/android/ui_resource_provider_impl.h',

'browser/appcache/appcache.cc',