ui/compositor/compositor.gyp - Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2.

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: ui/compositor/compositor.gyp

Issue 10377155: Move ui/gfx/resources to ui/base/native_theme/resources Step2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: keep gfx_resources.pak for DumpRenderTree Created 8 years, 7 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: ui/compositor/compositor.gyp

diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp

index 99eebe997f993787f3d15034a34ac629c16bbfb8..09eabf53646056c3b0882e5f5718194ca2da3069 100644

--- a/ui/compositor/compositor.gyp

+++ b/ui/compositor/compositor.gyp

@@ -61,7 +61,7 @@

# TODO(sky): before we make this real need to remove

# IDR_BITMAP_BRUSH_IMAGE.

'dependencies': [

- '<(DEPTH)/ui/ui.gyp:gfx_resources',

+ '<(DEPTH)/ui/ui.gyp:native_theme_resources',

'<(DEPTH)/third_party/angle/src/build_angle.gyp:libEGL',

'<(DEPTH)/third_party/angle/src/build_angle.gyp:libGLESv2',

@@ -123,7 +123,7 @@

'test/test_suite.h',

'test/test_utils.cc',

'test/test_utils.h',

- '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.rc',

'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc'

'conditions': [