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

Side by Side Diff: chrome/chrome.gyp

Issue 6685099: Removing command_execution_timeout_ms in favor of action_max_timeout_ms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 8 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 | « base/test/test_timeouts.cc ('k') | chrome/test/automation/automation_json_requests.h » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 'message': 'Generating version header file: <@(_outputs)', 1402 'message': 'Generating version header file: <@(_outputs)',
1403 }, 1403 },
1404 ], 1404 ],
1405 }, 1405 },
1406 { 1406 {
1407 'target_name': 'automation', 1407 'target_name': 'automation',
1408 'type': '<(library)', 1408 'type': '<(library)',
1409 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12', 1409 'msvs_guid': '1556EF78-C7E6-43C8-951F-F6B43AC0DD12',
1410 'dependencies': [ 1410 'dependencies': [
1411 'theme_resources', 1411 'theme_resources',
1412 '../base/base.gyp:test_support_base',
1412 '../skia/skia.gyp:skia', 1413 '../skia/skia.gyp:skia',
1413 '../testing/gtest.gyp:gtest', 1414 '../testing/gtest.gyp:gtest',
1414 ], 1415 ],
1415 'include_dirs': [ 1416 'include_dirs': [
1416 '..', 1417 '..',
1417 ], 1418 ],
1418 'sources': [ 1419 'sources': [
1419 'test/automation/autocomplete_edit_proxy.cc', 1420 'test/automation/autocomplete_edit_proxy.cc',
1420 'test/automation/autocomplete_edit_proxy.h', 1421 'test/automation/autocomplete_edit_proxy.h',
1421 'test/automation/automation_handle_tracker.cc', 1422 'test/automation/automation_handle_tracker.cc',
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
1558 }], # targets 1559 }], # targets
1559 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1560 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1560 ], # 'conditions' 1561 ], # 'conditions'
1561 } 1562 }
1562 1563
1563 # Local Variables: 1564 # Local Variables:
1564 # tab-width:2 1565 # tab-width:2
1565 # indent-tabs-mode:nil 1566 # indent-tabs-mode:nil
1566 # End: 1567 # End:
1567 # vim: set expandtab tabstop=2 shiftwidth=2: 1568 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « base/test/test_timeouts.cc ('k') | chrome/test/automation/automation_json_requests.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698