Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(643)

Issues Search
    My Issues | Starred     Open | Closed | All

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: merge 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:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/resources_util.cc ('K') | « ui/base/strings/ui_strings.gyp ('k') | ui/oak/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/compositor/compositor.gyp
diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
index 659b64176544f58d0a9057127797ac68b888ad7c..20b8e8e254d2d9a462ef08d3f31252deecaf81e8 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',
],
@@ -127,7 +126,6 @@
'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',
],
'conditions': [
# osmesa GL implementation is used on linux.
« chrome/browser/resources_util.cc ('K') | « ui/base/strings/ui_strings.gyp ('k') | ui/oak/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698