ui/compositor/compositor.gyp - Issue 10756018: Merge grd files in ui/resources and chrome/app/theme

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 10756018: Merge grd files in ui/resources and chrome/app/theme (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, *_standard.rc Created 8 years, 5 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 659b64176544f58d0a9057127797ac68b888ad7c..ed5e37c6f26947b98e370ffa037be56a7dbc3805 100644

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

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

@@ -62,7 +62,7 @@

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

# IDR_BITMAP_BRUSH_IMAGE.

'dependencies': [

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

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

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

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

@@ -104,7 +104,6 @@

'<(DEPTH)/ui/gl/gl.gyp:gl',

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

'<(DEPTH)/ui/ui.gyp:ui_resources',

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

'compositor',

'compositor_test_support',

@@ -126,8 +125,7 @@

'test/test_suite.h',

'test/test_utils.cc',

'test/test_utils.h',

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

- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc',

+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',

'conditions': [

# osmesa GL implementation is used on linux.

« no previous file with comments | « ui/base/strings/ui_strings.gyp ('k') | ui/oak/DEPS » ('j') | no next file with comments »