content/content_browser.gypi - Issue 10532155: Upstream some more content/ DEPS-related cleanup.

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 10532155: Upstream some more content/ DEPS-related cleanup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: address comments Created 8 years, 6 months 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 168a9ad46084fe2be4de165e4f2d15c807541d38..feaff595e7d59b94f03eef20c4b2dfbea936c063 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -30,6 +30,7 @@

'sources': [

'port/browser/render_view_host_delegate_view.h',

'port/browser/render_widget_host_view_port.h',

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

Ted C 2012/06/15 20:52:17 Last I talked about this with jam, he preferred no

'public/browser/access_token_store.h',

'public/browser/browser_accessibility_state.h',

'public/browser/browser_child_process_host.h',

@@ -187,8 +188,7 @@

'browser/accessibility/browser_accessibility_win.h',

'browser/android/android_browser_process.cc',

'browser/android/android_browser_process.h',

- 'browser/android/command_line.cc',

- 'browser/android/command_line.h',

+ 'browser/android/bitmap_holder.cc',

'browser/android/content_startup_flags.cc',

'browser/android/content_startup_flags.h',

'browser/android/content_util.cc',

@@ -201,12 +201,8 @@

'browser/android/device_info.h',

'browser/android/download_controller.cc',

'browser/android/download_controller.h',

- 'browser/android/jni_helper.cc',

- 'browser/android/jni_helper.h',

'browser/android/sandboxed_process_launcher.cc',

'browser/android/sandboxed_process_launcher.h',

- 'browser/android/trace_event_binding.cc',

- 'browser/android/trace_event_binding.h',

'browser/appcache/appcache_dispatcher_host.cc',

'browser/appcache/appcache_dispatcher_host.h',

'browser/appcache/appcache_frontend_proxy.cc',