content/content_browser.gypi - Issue 9297041: Merge Compositor and CompositorCC

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 9297041: Merge Compositor and CompositorCC (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 11 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 1c23638023a2f81792e076f01f5ec91bb9388180..623c7e9fa6dae39a84be06839c9c18da2a5aab22 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -399,7 +399,7 @@

'browser/quota_permission_context.h',

'browser/renderer_host/accelerated_plugin_view_mac.h',

'browser/renderer_host/accelerated_plugin_view_mac.mm',

- 'browser/renderer_host/accelerated_surface_container_linux_cc.cc',

+ 'browser/renderer_host/accelerated_surface_container_linux.cc',

'browser/renderer_host/accelerated_surface_container_linux.h',

'browser/renderer_host/accelerated_surface_container_mac.cc',

'browser/renderer_host/accelerated_surface_container_mac.h',

@@ -823,7 +823,7 @@

}, {

'sources/': [

- ['exclude', '^browser/renderer_host/accelerated_surface_container_linux_cc.cc'],

+ ['exclude', '^browser/renderer_host/accelerated_surface_container_linux.cc'],

['exclude', '^browser/renderer_host/accelerated_surface_container_linux.h'],

['exclude', '^browser/renderer_host/image_transport_client.cc'],

['exclude', '^browser/renderer_host/image_transport_client.h'],