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

Side by Side Diff: chrome/chrome.gyp

Issue 172031: Update gyp files and DEPS for icu42 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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
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 8
9 # Define the common dependencies that contain all the actual 9 # Define the common dependencies that contain all the actual
10 # Chromium functionality. This list gets pulled in below by 10 # Chromium functionality. This list gets pulled in below by
(...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 'chrome_resources', 399 'chrome_resources',
400 'chrome_strings', 400 'chrome_strings',
401 'theme_resources', 401 'theme_resources',
402 '../app/app.gyp:app_base', 402 '../app/app.gyp:app_base',
403 '../base/base.gyp:base', 403 '../base/base.gyp:base',
404 '../base/base.gyp:base_gfx', 404 '../base/base.gyp:base_gfx',
405 '../build/temp_gyp/googleurl.gyp:googleurl', 405 '../build/temp_gyp/googleurl.gyp:googleurl',
406 '../ipc/ipc.gyp:ipc', 406 '../ipc/ipc.gyp:ipc',
407 '../net/net.gyp:net', 407 '../net/net.gyp:net',
408 '../skia/skia.gyp:skia', 408 '../skia/skia.gyp:skia',
409 '../third_party/icu38/icu38.gyp:icui18n', 409 '../third_party/icu/icu.gyp:icui18n',
410 '../third_party/icu38/icu38.gyp:icuuc', 410 '../third_party/icu/icu.gyp:icuuc',
411 '../third_party/libxml/libxml.gyp:libxml', 411 '../third_party/libxml/libxml.gyp:libxml',
412 '../third_party/sqlite/sqlite.gyp:sqlite', 412 '../third_party/sqlite/sqlite.gyp:sqlite',
413 '../third_party/zlib/zlib.gyp:zlib', 413 '../third_party/zlib/zlib.gyp:zlib',
414 '../third_party/npapi/npapi.gyp:npapi', 414 '../third_party/npapi/npapi.gyp:npapi',
415 '../webkit/webkit.gyp:appcache', 415 '../webkit/webkit.gyp:appcache',
416 '../webkit/webkit.gyp:glue', 416 '../webkit/webkit.gyp:glue',
417 ], 417 ],
418 'include_dirs': [ 418 'include_dirs': [
419 '..', 419 '..',
420 ], 420 ],
(...skipping 243 matching lines...) Expand 10 before | Expand all | Expand 10 after
664 'chrome_resources', 664 'chrome_resources',
665 'chrome_strings', 665 'chrome_strings',
666 'theme_resources', 666 'theme_resources',
667 '../app/app.gyp:app_resources', 667 '../app/app.gyp:app_resources',
668 '../app/app.gyp:app_strings', 668 '../app/app.gyp:app_strings',
669 '../media/media.gyp:media', 669 '../media/media.gyp:media',
670 '../net/net.gyp:net_resources', 670 '../net/net.gyp:net_resources',
671 '../printing/printing.gyp:printing', 671 '../printing/printing.gyp:printing',
672 '../skia/skia.gyp:skia', 672 '../skia/skia.gyp:skia',
673 '../third_party/bzip2/bzip2.gyp:bzip2', 673 '../third_party/bzip2/bzip2.gyp:bzip2',
674 '../third_party/icu38/icu38.gyp:icui18n', 674 '../third_party/icu/icu.gyp:icui18n',
675 '../third_party/icu38/icu38.gyp:icuuc', 675 '../third_party/icu/icu.gyp:icuuc',
676 '../third_party/libxml/libxml.gyp:libxml', 676 '../third_party/libxml/libxml.gyp:libxml',
677 '../third_party/npapi/npapi.gyp:npapi', 677 '../third_party/npapi/npapi.gyp:npapi',
678 '../third_party/hunspell/hunspell.gyp:hunspell', 678 '../third_party/hunspell/hunspell.gyp:hunspell',
679 '../webkit/webkit.gyp:glue', 679 '../webkit/webkit.gyp:glue',
680 ], 680 ],
681 'include_dirs': [ 681 'include_dirs': [
682 '..', 682 '..',
683 '<(INTERMEDIATE_DIR)', 683 '<(INTERMEDIATE_DIR)',
684 ], 684 ],
685 'sources': [ 685 'sources': [
(...skipping 1973 matching lines...) Expand 10 before | Expand all | Expand 10 after
2659 }, 2659 },
2660 { 2660 {
2661 'target_name': 'debugger', 2661 'target_name': 'debugger',
2662 'type': '<(library)', 2662 'type': '<(library)',
2663 'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6', 2663 'msvs_guid': '57823D8C-A317-4713-9125-2C91FDFD12D6',
2664 'dependencies': [ 2664 'dependencies': [
2665 'chrome_resources', 2665 'chrome_resources',
2666 'chrome_strings', 2666 'chrome_strings',
2667 'theme_resources', 2667 'theme_resources',
2668 '../skia/skia.gyp:skia', 2668 '../skia/skia.gyp:skia',
2669 '../third_party/icu38/icu38.gyp:icui18n', 2669 '../third_party/icu/icu.gyp:icui18n',
2670 '../third_party/icu38/icu38.gyp:icuuc', 2670 '../third_party/icu/icu.gyp:icuuc',
2671 ], 2671 ],
2672 'include_dirs': [ 2672 'include_dirs': [
2673 '..', 2673 '..',
2674 ], 2674 ],
2675 'sources': [ 2675 'sources': [
2676 'browser/debugger/debugger_remote_service.cc', 2676 'browser/debugger/debugger_remote_service.cc',
2677 'browser/debugger/debugger_remote_service.h', 2677 'browser/debugger/debugger_remote_service.h',
2678 'browser/debugger/debugger_wrapper.cc', 2678 'browser/debugger/debugger_wrapper.cc',
2679 'browser/debugger/debugger_wrapper.h', 2679 'browser/debugger/debugger_wrapper.h',
2680 'browser/debugger/devtools_client_host.h', 2680 'browser/debugger/devtools_client_host.h',
(...skipping 26 matching lines...) Expand all
2707 { 2707 {
2708 'target_name': 'plugin', 2708 'target_name': 'plugin',
2709 'type': '<(library)', 2709 'type': '<(library)',
2710 'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A', 2710 'msvs_guid': '20A560A0-2CD0-4D9E-A58B-1F24B99C087A',
2711 'dependencies': [ 2711 'dependencies': [
2712 'common', 2712 'common',
2713 'chrome_resources', 2713 'chrome_resources',
2714 'chrome_strings', 2714 'chrome_strings',
2715 '../media/media.gyp:media', 2715 '../media/media.gyp:media',
2716 '../skia/skia.gyp:skia', 2716 '../skia/skia.gyp:skia',
2717 '../third_party/icu38/icu38.gyp:icui18n', 2717 '../third_party/icu/icu.gyp:icui18n',
2718 '../third_party/icu38/icu38.gyp:icuuc', 2718 '../third_party/icu/icu.gyp:icuuc',
2719 '../third_party/libxml/libxml.gyp:libxml', 2719 '../third_party/libxml/libxml.gyp:libxml',
2720 '../third_party/npapi/npapi.gyp:npapi', 2720 '../third_party/npapi/npapi.gyp:npapi',
2721 '../third_party/hunspell/hunspell.gyp:hunspell', 2721 '../third_party/hunspell/hunspell.gyp:hunspell',
2722 '../webkit/webkit.gyp:glue', 2722 '../webkit/webkit.gyp:glue',
2723 ], 2723 ],
2724 'include_dirs': [ 2724 'include_dirs': [
2725 '<(INTERMEDIATE_DIR)', 2725 '<(INTERMEDIATE_DIR)',
2726 ], 2726 ],
2727 'sources': [ 2727 'sources': [
2728 # All .cc, .h, .m, and .mm files under plugins except for tests and 2728 # All .cc, .h, .m, and .mm files under plugins except for tests and
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
2766 'target_name': 'renderer', 2766 'target_name': 'renderer',
2767 'type': '<(library)', 2767 'type': '<(library)',
2768 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D', 2768 'msvs_guid': '9301A569-5D2B-4D11-9332-B1E30AEACB8D',
2769 'dependencies': [ 2769 'dependencies': [
2770 'common', 2770 'common',
2771 'plugin', 2771 'plugin',
2772 'chrome_resources', 2772 'chrome_resources',
2773 'chrome_strings', 2773 'chrome_strings',
2774 '../printing/printing.gyp:printing', 2774 '../printing/printing.gyp:printing',
2775 '../skia/skia.gyp:skia', 2775 '../skia/skia.gyp:skia',
2776 '../third_party/icu38/icu38.gyp:icui18n', 2776 '../third_party/icu/icu.gyp:icui18n',
2777 '../third_party/icu38/icu38.gyp:icuuc', 2777 '../third_party/icu/icu.gyp:icuuc',
2778 '../third_party/npapi/npapi.gyp:npapi', 2778 '../third_party/npapi/npapi.gyp:npapi',
2779 '../webkit/webkit.gyp:glue', 2779 '../webkit/webkit.gyp:glue',
2780 '../webkit/webkit.gyp:webkit', 2780 '../webkit/webkit.gyp:webkit',
2781 ], 2781 ],
2782 'include_dirs': [ 2782 'include_dirs': [
2783 '..', 2783 '..',
2784 ], 2784 ],
2785 'sources': [ 2785 'sources': [
2786 # TODO(jrg): to link ipc_tests, these files need to be in renderer.a. 2786 # TODO(jrg): to link ipc_tests, these files need to be in renderer.a.
2787 # But app/ is the wrong directory for them. 2787 # But app/ is the wrong directory for them.
(...skipping 941 matching lines...) Expand 10 before | Expand all | Expand 10 after
3729 'common', 3729 'common',
3730 'chrome_resources', 3730 'chrome_resources',
3731 'chrome_strings', 3731 'chrome_strings',
3732 'syncapi', 3732 'syncapi',
3733 'test_support_ui', 3733 'test_support_ui',
3734 '../base/base.gyp:base', 3734 '../base/base.gyp:base',
3735 '../net/net.gyp:net', 3735 '../net/net.gyp:net',
3736 '../build/temp_gyp/googleurl.gyp:googleurl', 3736 '../build/temp_gyp/googleurl.gyp:googleurl',
3737 '../skia/skia.gyp:skia', 3737 '../skia/skia.gyp:skia',
3738 '../testing/gtest.gyp:gtest', 3738 '../testing/gtest.gyp:gtest',
3739 '../third_party/icu38/icu38.gyp:icui18n', 3739 '../third_party/icu/icu.gyp:icui18n',
3740 '../third_party/icu38/icu38.gyp:icuuc', 3740 '../third_party/icu/icu.gyp:icuuc',
3741 '../third_party/libxml/libxml.gyp:libxml', 3741 '../third_party/libxml/libxml.gyp:libxml',
3742 ], 3742 ],
3743 'include_dirs': [ 3743 'include_dirs': [
3744 '..', 3744 '..',
3745 ], 3745 ],
3746 'sources': [ 3746 'sources': [
3747 'app/chrome_main_uitest.cc', 3747 'app/chrome_main_uitest.cc',
3748 'browser/browser_encoding_uitest.cc', 3748 'browser/browser_encoding_uitest.cc',
3749 'browser/browser_uitest.cc', 3749 'browser/browser_uitest.cc',
3750 'browser/download/download_uitest.cc', 3750 'browser/download/download_uitest.cc',
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
3883 '../ipc/ipc.gyp:ipc', 3883 '../ipc/ipc.gyp:ipc',
3884 '../net/net.gyp:net_resources', 3884 '../net/net.gyp:net_resources',
3885 '../net/net.gyp:net_test_support', 3885 '../net/net.gyp:net_test_support',
3886 '../printing/printing.gyp:printing', 3886 '../printing/printing.gyp:printing',
3887 '../webkit/webkit.gyp:webkit', 3887 '../webkit/webkit.gyp:webkit',
3888 '../webkit/webkit.gyp:webkit_resources', 3888 '../webkit/webkit.gyp:webkit_resources',
3889 '../skia/skia.gyp:skia', 3889 '../skia/skia.gyp:skia',
3890 '../testing/gmock.gyp:gmock', 3890 '../testing/gmock.gyp:gmock',
3891 '../testing/gtest.gyp:gtest', 3891 '../testing/gtest.gyp:gtest',
3892 '../third_party/bzip2/bzip2.gyp:bzip2', 3892 '../third_party/bzip2/bzip2.gyp:bzip2',
3893 '../third_party/icu38/icu38.gyp:icui18n', 3893 '../third_party/icu/icu.gyp:icui18n',
3894 '../third_party/icu38/icu38.gyp:icuuc', 3894 '../third_party/icu/icu.gyp:icuuc',
3895 '../third_party/libxml/libxml.gyp:libxml', 3895 '../third_party/libxml/libxml.gyp:libxml',
3896 '../third_party/npapi/npapi.gyp:npapi', 3896 '../third_party/npapi/npapi.gyp:npapi',
3897 ], 3897 ],
3898 'include_dirs': [ 3898 'include_dirs': [
3899 '..', 3899 '..',
3900 ], 3900 ],
3901 'defines': [ 3901 'defines': [
3902 'CLD_WINDOWS', 3902 'CLD_WINDOWS',
3903 ], 3903 ],
3904 'direct_dependent_settings': { 3904 'direct_dependent_settings': {
(...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after
5162 'chrome', 5162 'chrome',
5163 'chrome_resources', 5163 'chrome_resources',
5164 'chrome_strings', 5164 'chrome_strings',
5165 'debugger', 5165 'debugger',
5166 'test_support_common', 5166 'test_support_common',
5167 'test_support_ui', 5167 'test_support_ui',
5168 'syncapi', 5168 'syncapi',
5169 '../third_party/hunspell/hunspell.gyp:hunspell', 5169 '../third_party/hunspell/hunspell.gyp:hunspell',
5170 '../net/net.gyp:net_resources', 5170 '../net/net.gyp:net_resources',
5171 '../skia/skia.gyp:skia', 5171 '../skia/skia.gyp:skia',
5172 '../third_party/icu38/icu38.gyp:icui18n', 5172 '../third_party/icu/icu.gyp:icui18n',
5173 '../third_party/libpng/libpng.gyp:libpng', 5173 '../third_party/libpng/libpng.gyp:libpng',
5174 '../third_party/libxml/libxml.gyp:libxml', 5174 '../third_party/libxml/libxml.gyp:libxml',
5175 '../third_party/zlib/zlib.gyp:zlib', 5175 '../third_party/zlib/zlib.gyp:zlib',
5176 '../testing/gtest.gyp:gtest', 5176 '../testing/gtest.gyp:gtest',
5177 '../third_party/npapi/npapi.gyp:npapi', 5177 '../third_party/npapi/npapi.gyp:npapi',
5178 # run time dependency 5178 # run time dependency
5179 '../webkit/webkit.gyp:webkit_resources', 5179 '../webkit/webkit.gyp:webkit_resources',
5180 ], 5180 ],
5181 'include_dirs': [ 5181 'include_dirs': [
5182 '..', 5182 '..',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
5292 'dependencies': [ 5292 'dependencies': [
5293 'browser', 5293 'browser',
5294 'chrome', 5294 'chrome',
5295 'chrome_resources', 5295 'chrome_resources',
5296 'chrome_strings', 5296 'chrome_strings',
5297 'debugger', 5297 'debugger',
5298 'test_support_common', 5298 'test_support_common',
5299 '../base/base.gyp:test_support_base', 5299 '../base/base.gyp:test_support_base',
5300 '../skia/skia.gyp:skia', 5300 '../skia/skia.gyp:skia',
5301 '../testing/gtest.gyp:gtest', 5301 '../testing/gtest.gyp:gtest',
5302 '../third_party/icu38/icu38.gyp:icui18n', 5302 '../third_party/icu/icu.gyp:icui18n',
5303 '../third_party/icu38/icu38.gyp:icuuc', 5303 '../third_party/icu/icu.gyp:icuuc',
5304 ], 5304 ],
5305 'include_dirs': [ 5305 'include_dirs': [
5306 '..', 5306 '..',
5307 ], 5307 ],
5308 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], 5308 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
5309 'sources': [ 5309 'sources': [
5310 'test/browser/run_all_unittests.cc', 5310 'test/browser/run_all_unittests.cc',
5311 'test/browser/browser_test_launcher_out_of_proc.cc', 5311 'test/browser/browser_test_launcher_out_of_proc.cc',
5312 'test/browser/browser_test_runner.cc', 5312 'test/browser/browser_test_runner.cc',
5313 'test/browser/browser_test_runner.h', 5313 'test/browser/browser_test_runner.h',
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
5364 '../rlz/rlz.gyp:*', 5364 '../rlz/rlz.gyp:*',
5365 '../sdch/sdch.gyp:*', 5365 '../sdch/sdch.gyp:*',
5366 '../skia/skia.gyp:*', 5366 '../skia/skia.gyp:*',
5367 '../testing/gmock.gyp:*', 5367 '../testing/gmock.gyp:*',
5368 '../testing/gtest.gyp:*', 5368 '../testing/gtest.gyp:*',
5369 '../third_party/bsdiff/bsdiff.gyp:*', 5369 '../third_party/bsdiff/bsdiff.gyp:*',
5370 '../third_party/bspatch/bspatch.gyp:*', 5370 '../third_party/bspatch/bspatch.gyp:*',
5371 '../third_party/bzip2/bzip2.gyp:*', 5371 '../third_party/bzip2/bzip2.gyp:*',
5372 '../third_party/cld/cld.gyp:cld', 5372 '../third_party/cld/cld.gyp:cld',
5373 '../third_party/codesighs/codesighs.gyp:*', 5373 '../third_party/codesighs/codesighs.gyp:*',
5374 '../third_party/icu38/icu38.gyp:*', 5374 '../third_party/icu/icu.gyp:*',
5375 '../third_party/libjpeg/libjpeg.gyp:*', 5375 '../third_party/libjpeg/libjpeg.gyp:*',
5376 '../third_party/libpng/libpng.gyp:*', 5376 '../third_party/libpng/libpng.gyp:*',
5377 '../third_party/libxml/libxml.gyp:*', 5377 '../third_party/libxml/libxml.gyp:*',
5378 '../third_party/libxslt/libxslt.gyp:*', 5378 '../third_party/libxslt/libxslt.gyp:*',
5379 '../third_party/lzma_sdk/lzma_sdk.gyp:*', 5379 '../third_party/lzma_sdk/lzma_sdk.gyp:*',
5380 '../third_party/modp_b64/modp_b64.gyp:*', 5380 '../third_party/modp_b64/modp_b64.gyp:*',
5381 '../third_party/npapi/npapi.gyp:*', 5381 '../third_party/npapi/npapi.gyp:*',
5382 '../third_party/sqlite/sqlite.gyp:*', 5382 '../third_party/sqlite/sqlite.gyp:*',
5383 '../third_party/tcmalloc/tcmalloc.gyp:*', 5383 '../third_party/tcmalloc/tcmalloc.gyp:*',
5384 '../third_party/zlib/zlib.gyp:*', 5384 '../third_party/zlib/zlib.gyp:*',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
5494 'debugger', 5494 'debugger',
5495 'renderer', 5495 'renderer',
5496 'chrome_resources', 5496 'chrome_resources',
5497 'chrome_strings', 5497 'chrome_strings',
5498 'syncapi', 5498 'syncapi',
5499 'test_support_unit', 5499 'test_support_unit',
5500 '../printing/printing.gyp:printing', 5500 '../printing/printing.gyp:printing',
5501 '../webkit/webkit.gyp:webkit', 5501 '../webkit/webkit.gyp:webkit',
5502 '../skia/skia.gyp:skia', 5502 '../skia/skia.gyp:skia',
5503 '../testing/gtest.gyp:gtest', 5503 '../testing/gtest.gyp:gtest',
5504 '../third_party/icu38/icu38.gyp:icui18n', 5504 '../third_party/icu/icu.gyp:icui18n',
5505 '../third_party/icu38/icu38.gyp:icuuc', 5505 '../third_party/icu/icu.gyp:icuuc',
5506 '../third_party/libxml/libxml.gyp:libxml', 5506 '../third_party/libxml/libxml.gyp:libxml',
5507 '../third_party/npapi/npapi.gyp:npapi', 5507 '../third_party/npapi/npapi.gyp:npapi',
5508 ], 5508 ],
5509 'include_dirs': [ 5509 'include_dirs': [
5510 '..', 5510 '..',
5511 '<(INTERMEDIATE_DIR)', 5511 '<(INTERMEDIATE_DIR)',
5512 ], 5512 ],
5513 # TODO(phajdan.jr): Only temporary, to make transition easier. 5513 # TODO(phajdan.jr): Only temporary, to make transition easier.
5514 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ], 5514 'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
5515 'sources': [ 5515 'sources': [
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
5577 'browser', 5577 'browser',
5578 'chrome_dll_version', 5578 'chrome_dll_version',
5579 'chrome_resources', 5579 'chrome_resources',
5580 'installer/installer.gyp:installer_util_strings', 5580 'installer/installer.gyp:installer_util_strings',
5581 'debugger', 5581 'debugger',
5582 'renderer', 5582 'renderer',
5583 'syncapi', 5583 'syncapi',
5584 '../base/base.gyp:test_support_base', 5584 '../base/base.gyp:test_support_base',
5585 '../skia/skia.gyp:skia', 5585 '../skia/skia.gyp:skia',
5586 '../testing/gtest.gyp:gtest', 5586 '../testing/gtest.gyp:gtest',
5587 '../third_party/icu38/icu38.gyp:icui18n', 5587 '../third_party/icu/icu.gyp:icui18n',
5588 '../third_party/icu38/icu38.gyp:icuuc', 5588 '../third_party/icu/icu.gyp:icuuc',
5589 ], 5589 ],
5590 'include_dirs': [ 5590 'include_dirs': [
5591 '..', 5591 '..',
5592 'third_party/wtl/include', 5592 'third_party/wtl/include',
5593 ], 5593 ],
5594 'configurations': { 5594 'configurations': {
5595 'Debug': { 5595 'Debug': {
5596 'msvs_settings': { 5596 'msvs_settings': {
5597 'VCLinkerTool': { 5597 'VCLinkerTool': {
5598 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 5598 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
5897 # Use outputs of this action as inputs for the main target build. 5897 # Use outputs of this action as inputs for the main target build.
5898 # Seems as a misnomer but makes this happy on Linux (scons). 5898 # Seems as a misnomer but makes this happy on Linux (scons).
5899 'process_outputs_as_sources': 1, 5899 'process_outputs_as_sources': 1,
5900 }, 5900 },
5901 ], # 'actions' 5901 ], # 'actions'
5902 }, 5902 },
5903 ] 5903 ]
5904 }], 5904 }],
5905 ], # 'conditions' 5905 ], # 'conditions'
5906 } 5906 }
OLDNEW
« no previous file with comments | « chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc ('k') | chrome/common/common.vsprops » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698