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

Side by Side Diff: chrome/chrome.gyp

Issue 164369: Merge 22244 - Try again to land: http://codereview.chromium.org/160483... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | « chrome/browser/extensions/theme_preview_infobar_delegate.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/chrome/chrome.gyp:r22244
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after
920 'browser/extensions/extension_event_names.cc', 920 'browser/extensions/extension_event_names.cc',
921 'browser/extensions/extension_event_names.h', 921 'browser/extensions/extension_event_names.h',
922 'browser/extensions/extension_file_util.cc', 922 'browser/extensions/extension_file_util.cc',
923 'browser/extensions/extension_file_util.h', 923 'browser/extensions/extension_file_util.h',
924 'browser/extensions/extension_function.cc', 924 'browser/extensions/extension_function.cc',
925 'browser/extensions/extension_function.h', 925 'browser/extensions/extension_function.h',
926 'browser/extensions/extension_function_dispatcher.cc', 926 'browser/extensions/extension_function_dispatcher.cc',
927 'browser/extensions/extension_function_dispatcher.h', 927 'browser/extensions/extension_function_dispatcher.h',
928 'browser/extensions/extension_host.cc', 928 'browser/extensions/extension_host.cc',
929 'browser/extensions/extension_host.h', 929 'browser/extensions/extension_host.h',
930 'browser/extensions/extension_install_ui.cc',
931 'browser/extensions/extension_install_ui.h',
930 'browser/extensions/extension_message_service.cc', 932 'browser/extensions/extension_message_service.cc',
931 'browser/extensions/extension_message_service.h', 933 'browser/extensions/extension_message_service.h',
932 'browser/extensions/extension_browser_event_router.cc', 934 'browser/extensions/extension_browser_event_router.cc',
933 'browser/extensions/extension_browser_event_router.h', 935 'browser/extensions/extension_browser_event_router.h',
934 'browser/extensions/extension_page_actions_module.cc', 936 'browser/extensions/extension_page_actions_module.cc',
935 'browser/extensions/extension_page_actions_module.h', 937 'browser/extensions/extension_page_actions_module.h',
936 'browser/extensions/extension_page_actions_module_constants.cc', 938 'browser/extensions/extension_page_actions_module_constants.cc',
937 'browser/extensions/extension_page_actions_module_constants.h', 939 'browser/extensions/extension_page_actions_module_constants.h',
938 'browser/extensions/extension_prefs.cc', 940 'browser/extensions/extension_prefs.cc',
939 'browser/extensions/extension_prefs.h', 941 'browser/extensions/extension_prefs.h',
(...skipping 4122 matching lines...) Expand 10 before | Expand all | Expand 10 after
5062 # Use outputs of this action as inputs for the main target build. 5064 # Use outputs of this action as inputs for the main target build.
5063 # Seems as a misnomer but makes this happy on Linux (scons). 5065 # Seems as a misnomer but makes this happy on Linux (scons).
5064 'process_outputs_as_sources': 1, 5066 'process_outputs_as_sources': 1,
5065 }, 5067 },
5066 ], # 'actions' 5068 ], # 'actions'
5067 }, 5069 },
5068 ] 5070 ]
5069 }], 5071 }],
5070 ], # 'conditions' 5072 ], # 'conditions'
5071 } 5073 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/theme_preview_infobar_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698