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

Side by Side Diff: content/content_browser.gypi

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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/browser/web_contents/web_drag_source_mac.mm ('k') | content/content_shell.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 'browser/debugger/devtools_resources.gyp:devtools_resources', 7 'browser/debugger/devtools_resources.gyp:devtools_resources',
8 'browser/speech/proto/speech_proto.gyp:speech_proto', 8 'browser/speech/proto/speech_proto.gyp:speech_proto',
9 '../base/base.gyp:base_static', 9 '../base/base.gyp:base_static',
10 '../crypto/crypto.gyp:crypto', 10 '../crypto/crypto.gyp:crypto',
11 '../net/net.gyp:http_server', 11 '../net/net.gyp:http_server',
12 '../net/net.gyp:net', 12 '../net/net.gyp:net',
13 '../ppapi/ppapi_internal.gyp:ppapi_proxy', 13 '../ppapi/ppapi_internal.gyp:ppapi_proxy',
14 '../skia/skia.gyp:skia', 14 '../skia/skia.gyp:skia',
15 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 15 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
16 '../third_party/zlib/zlib.gyp:zlib', 16 '../third_party/zlib/zlib.gyp:zlib',
17 '../ui/surface/surface.gyp:surface', 17 '../ui/surface/surface.gyp:surface',
18 '../ui/ui.gyp:ui', 18 '../ui/ui.gyp:ui',
19 '../ui/ui.gyp:ui_resources', 19 '../ui/ui.gyp:ui_resources',
20 '../ui/ui.gyp:ui_resources_standard',
21 '../webkit/support/webkit_support.gyp:dom_storage', 20 '../webkit/support/webkit_support.gyp:dom_storage',
22 '../webkit/support/webkit_support.gyp:webkit_resources', 21 '../webkit/support/webkit_support.gyp:webkit_resources',
23 '../webkit/support/webkit_support.gyp:webkit_strings', 22 '../webkit/support/webkit_support.gyp:webkit_strings',
24 ], 23 ],
25 'include_dirs': [ 24 'include_dirs': [
26 '..', 25 '..',
27 '<(INTERMEDIATE_DIR)', 26 '<(INTERMEDIATE_DIR)',
28 ], 27 ],
29 'sources': [ 28 'sources': [
30 'port/browser/render_view_host_delegate_view.h', 29 'port/browser/render_view_host_delegate_view.h',
(...skipping 948 matching lines...) Expand 10 before | Expand all | Expand 10 after
979 ], 978 ],
980 }], 979 }],
981 ['input_speech==0', { 980 ['input_speech==0', {
982 'sources/': [ 981 'sources/': [
983 ['exclude', '^browser/speech/'], 982 ['exclude', '^browser/speech/'],
984 ], 983 ],
985 }], 984 }],
986 ], 985 ],
987 } 986 }
988 987
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_drag_source_mac.mm ('k') | content/content_shell.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698