| OLD | NEW | 
|    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   'targets': [ |    6   'targets': [ | 
|    7     { |    7     { | 
|    8       'target_name': 'common', |    8       'target_name': 'common', | 
|    9       'type': 'static_library', |    9       'type': 'static_library', | 
|   10       'variables': { |   10       'variables': { | 
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   81         '../extensions/common/matcher/url_matcher_helpers.cc', |   81         '../extensions/common/matcher/url_matcher_helpers.cc', | 
|   82         '../extensions/common/matcher/url_matcher_helpers.h', |   82         '../extensions/common/matcher/url_matcher_helpers.h', | 
|   83         '../extensions/common/url_pattern.cc', |   83         '../extensions/common/url_pattern.cc', | 
|   84         '../extensions/common/url_pattern.h', |   84         '../extensions/common/url_pattern.h', | 
|   85         '../extensions/common/url_pattern_set.cc', |   85         '../extensions/common/url_pattern_set.cc', | 
|   86         '../extensions/common/url_pattern_set.h', |   86         '../extensions/common/url_pattern_set.h', | 
|   87         'common/all_messages.h', |   87         'common/all_messages.h', | 
|   88         'common/attrition_experiments.h', |   88         'common/attrition_experiments.h', | 
|   89         'common/auto_start_linux.cc', |   89         'common/auto_start_linux.cc', | 
|   90         'common/auto_start_linux.h', |   90         'common/auto_start_linux.h', | 
|   91         'common/autofill/autocheckout_status.h', |  | 
|   92         'common/autofill/web_element_descriptor.cc', |  | 
|   93         'common/autofill/web_element_descriptor.h', |  | 
|   94         'common/autofill_messages.h', |  | 
|   95         'common/automation_constants.cc', |   91         'common/automation_constants.cc', | 
|   96         'common/automation_constants.h', |   92         'common/automation_constants.h', | 
|   97         'common/automation_events.cc', |   93         'common/automation_events.cc', | 
|   98         'common/automation_events.h', |   94         'common/automation_events.h', | 
|   99         'common/automation_id.cc', |   95         'common/automation_id.cc', | 
|  100         'common/automation_id.h', |   96         'common/automation_id.h', | 
|  101         'common/automation_messages.cc', |   97         'common/automation_messages.cc', | 
|  102         'common/automation_messages.h', |   98         'common/automation_messages.h', | 
|  103         'common/automation_messages_internal.h', |   99         'common/automation_messages_internal.h', | 
|  104         'common/badge_util.cc', |  100         'common/badge_util.cc', | 
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  273         'common/extensions/update_manifest.cc', |  269         'common/extensions/update_manifest.cc', | 
|  274         'common/extensions/update_manifest.h', |  270         'common/extensions/update_manifest.h', | 
|  275         'common/extensions/user_script.cc', |  271         'common/extensions/user_script.cc', | 
|  276         'common/extensions/user_script.h', |  272         'common/extensions/user_script.h', | 
|  277         'common/extensions/value_counter.cc', |  273         'common/extensions/value_counter.cc', | 
|  278         'common/extensions/value_counter.h', |  274         'common/extensions/value_counter.h', | 
|  279         'common/extensions/web_accessible_resources_handler.cc', |  275         'common/extensions/web_accessible_resources_handler.cc', | 
|  280         'common/extensions/web_accessible_resources_handler.h', |  276         'common/extensions/web_accessible_resources_handler.h', | 
|  281         'common/external_ipc_fuzzer.h', |  277         'common/external_ipc_fuzzer.h', | 
|  282         'common/external_ipc_fuzzer.cc', |  278         'common/external_ipc_fuzzer.cc', | 
|  283         'common/form_data.cc', |  | 
|  284         'common/form_data.h', |  | 
|  285         'common/form_data_predictions.cc', |  | 
|  286         'common/form_data_predictions.h', |  | 
|  287         'common/form_field_data.cc', |  | 
|  288         'common/form_field_data.h', |  | 
|  289         'common/form_field_data_predictions.cc', |  | 
|  290         'common/form_field_data_predictions.h', |  | 
|  291         'common/icon_with_badge_image_source.cc', |  279         'common/icon_with_badge_image_source.cc', | 
|  292         'common/icon_with_badge_image_source.h', |  280         'common/icon_with_badge_image_source.h', | 
|  293         'common/instant_types.cc', |  281         'common/instant_types.cc', | 
|  294         'common/instant_types.h', |  282         'common/instant_types.h', | 
|  295         'common/json_schema_constants.cc', |  283         'common/json_schema_constants.cc', | 
|  296         'common/json_schema_constants.h', |  284         'common/json_schema_constants.h', | 
|  297         'common/json_schema_validator.cc', |  285         'common/json_schema_validator.cc', | 
|  298         'common/json_schema_validator.h', |  286         'common/json_schema_validator.h', | 
|  299         'common/localized_error.cc', |  287         'common/localized_error.cc', | 
|  300         'common/localized_error.h', |  288         'common/localized_error.h', | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|  330         'common/multi_process_lock_linux.cc', |  318         'common/multi_process_lock_linux.cc', | 
|  331         'common/multi_process_lock_mac.cc', |  319         'common/multi_process_lock_mac.cc', | 
|  332         'common/multi_process_lock_win.cc', |  320         'common/multi_process_lock_win.cc', | 
|  333         'common/nacl_cmd_line.cc', |  321         'common/nacl_cmd_line.cc', | 
|  334         'common/nacl_cmd_line.h', |  322         'common/nacl_cmd_line.h', | 
|  335         'common/nacl_messages.cc', |  323         'common/nacl_messages.cc', | 
|  336         'common/nacl_messages.h', |  324         'common/nacl_messages.h', | 
|  337         'common/nacl_types.cc', |  325         'common/nacl_types.cc', | 
|  338         'common/nacl_types.h', |  326         'common/nacl_types.h', | 
|  339         'common/one_click_signin_messages.h', |  327         'common/one_click_signin_messages.h', | 
|  340         'common/password_form_fill_data.cc', |  | 
|  341         'common/password_form_fill_data.h', |  | 
|  342         'common/password_generation_util.cc', |  328         'common/password_generation_util.cc', | 
|  343         'common/password_generation_util.h', |  329         'common/password_generation_util.h', | 
|  344         'common/pepper_flash.cc', |  330         'common/pepper_flash.cc', | 
|  345         'common/pepper_flash.h', |  331         'common/pepper_flash.h', | 
|  346         'common/pref_names_util.cc', |  332         'common/pref_names_util.cc', | 
|  347         'common/pref_names_util.h', |  333         'common/pref_names_util.h', | 
|  348         'common/print_messages.cc', |  334         'common/print_messages.cc', | 
|  349         'common/print_messages.h', |  335         'common/print_messages.h', | 
|  350         'common/profiling.cc', |  336         'common/profiling.cc', | 
|  351         'common/profiling.h', |  337         'common/profiling.h', | 
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  394         'common/zip_internal.cc', |  380         'common/zip_internal.cc', | 
|  395         'common/zip_internal.h', |  381         'common/zip_internal.h', | 
|  396         'common/zip_reader.cc', |  382         'common/zip_reader.cc', | 
|  397         'common/zip_reader.h', |  383         'common/zip_reader.h', | 
|  398       ], |  384       ], | 
|  399       'conditions': [ |  385       'conditions': [ | 
|  400         ['OS != "ios"', { |  386         ['OS != "ios"', { | 
|  401           'dependencies': [ |  387           'dependencies': [ | 
|  402             '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy', |  388             '<(DEPTH)/chrome/app/policy/cloud_policy_codegen.gyp:policy', | 
|  403             '<(DEPTH)/chrome/common/extensions/api/api.gyp:api', |  389             '<(DEPTH)/chrome/common/extensions/api/api.gyp:api', | 
 |  390             '<(DEPTH)/components/components.gyp:autofill_common', | 
|  404             '<(DEPTH)/ipc/ipc.gyp:ipc', |  391             '<(DEPTH)/ipc/ipc.gyp:ipc', | 
|  405             '<(DEPTH)/printing/printing.gyp:printing', |  392             '<(DEPTH)/printing/printing.gyp:printing', | 
|  406             '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h
     ', |  393             '<(DEPTH)/third_party/adobe/flash/flash_player.gyp:flapper_version_h
     ', | 
|  407             '<(DEPTH)/third_party/re2/re2.gyp:re2', |  394             '<(DEPTH)/third_party/re2/re2.gyp:re2', | 
|  408             '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_ver
     sion_h', |  395             '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_ver
     sion_h', | 
|  409             '<(DEPTH)/webkit/support/webkit_support.gyp:glue', |  396             '<(DEPTH)/webkit/support/webkit_support.gyp:glue', | 
|  410           ], |  397           ], | 
|  411         }, {  # OS == ios |  398         }, {  # OS == ios | 
|  412           'sources/': [ |  399           'sources/': [ | 
|  413             ['exclude', '^common/child_process_'], |  400             ['exclude', '^common/child_process_'], | 
| (...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  520           ], |  507           ], | 
|  521         }], |  508         }], | 
|  522         ['remoting==1', { |  509         ['remoting==1', { | 
|  523           'dependencies': [ |  510           'dependencies': [ | 
|  524             '../remoting/remoting.gyp:remoting_client_plugin', |  511             '../remoting/remoting.gyp:remoting_client_plugin', | 
|  525           ], |  512           ], | 
|  526         }], |  513         }], | 
|  527         ['enable_automation==0', { |  514         ['enable_automation==0', { | 
|  528           'sources/': [ |  515           'sources/': [ | 
|  529             ['exclude', '^common/automation_'] |  516             ['exclude', '^common/automation_'] | 
|  530 »         ] |  517           ] | 
|  531         }], |  518         }], | 
|  532         ['use_system_nspr==1', { |  519         ['use_system_nspr==1', { | 
|  533           'dependencies': [ |  520           'dependencies': [ | 
|  534             '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr', |  521             '<(DEPTH)/base/third_party/nspr/nspr.gyp:nspr', | 
|  535           ], |  522           ], | 
|  536         }], |  523         }], | 
|  537       ], |  524       ], | 
|  538       'target_conditions': [ |  525       'target_conditions': [ | 
|  539         ['OS == "ios"', { |  526         ['OS == "ios"', { | 
|  540           'sources/': [ |  527           'sources/': [ | 
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  715         'common/metrics/proto/user_action_event.proto', |  702         'common/metrics/proto/user_action_event.proto', | 
|  716       ], |  703       ], | 
|  717       'variables': { |  704       'variables': { | 
|  718         'proto_in_dir': 'common/metrics/proto', |  705         'proto_in_dir': 'common/metrics/proto', | 
|  719         'proto_out_dir': 'chrome/common/metrics/proto', |  706         'proto_out_dir': 'chrome/common/metrics/proto', | 
|  720       }, |  707       }, | 
|  721       'includes': [ '../build/protoc.gypi' ], |  708       'includes': [ '../build/protoc.gypi' ], | 
|  722     }, |  709     }, | 
|  723   ], |  710   ], | 
|  724 } |  711 } | 
| OLD | NEW |