• Home
  • History
  • Annotate
  • only in /external/chromium_org/extensions/common/
History log of /external/chromium_org/extensions/common/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
5b892326406927b709cdaf6c384d4ababf456332 06-Nov-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.53

This commit was generated by merge_to_master.py.

Change-Id: Id583a0dc312e50e455eb8bd04f75c74304738c9d
sp_validator.cc
sp_validator_unittest.cc
1320f92c476a1ad9d19dba2a48c72b75566198e9 30-Sep-2014 Primiano Tucci <primiano@google.com> Merge from Chromium at DEPS revision 267aeeb8d85c

This commit was generated by merge_to_master.py.

Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
UILD.gn
EPS
WNERS
pi/BUILD.gn
pi/OWNERS
pi/_api_features.json
pi/_manifest_features.json
pi/_permission_features.json
pi/api.gyp
pi/app_current_window_internal.idl
pi/app_window.idl
pi/bluetooth.idl
pi/bluetooth/bluetooth_manifest_data.cc
pi/bluetooth/bluetooth_manifest_data.h
pi/bluetooth/bluetooth_manifest_handler.cc
pi/bluetooth/bluetooth_manifest_handler.h
pi/bluetooth/bluetooth_manifest_permission.cc
pi/bluetooth/bluetooth_manifest_permission.h
pi/bluetooth_low_energy.idl
pi/bluetooth_private.json
pi/bluetooth_socket.idl
pi/cast_channel/BUILD.gn
pi/cast_channel/cast_channel.proto
pi/cast_channel/logging.proto
pi/declarative_web_request.json
pi/events.json
pi/extension_options_internal.idl
pi/extension_types.json
pi/extensions_manifest_types.json
pi/guest_view_internal.json
pi/hid.idl
pi/mime_handler_view_guest_internal.json
pi/schemas.gni
pi/schemas.gypi
pi/sockets/sockets_manifest_permission.cc
pi/sockets/sockets_manifest_permission_unittest.cc
pi/system_cpu.idl
pi/system_display.idl
pi/system_memory.idl
pi/system_network.idl
pi/system_storage.idl
pi/usb.idl
pi/usb_private.idl
pi/web_request.json
pi/web_request_internal.json
pi/web_view_internal.json
ommon_manifest_handlers.cc
onstants.cc
onstants.h
xtension_l10n_util.cc
xtension_l10n_util_unittest.cc
xtension_message_generator.h
xtension_messages.cc
xtension_messages.h
xtension_paths.cc
xtension_resource.cc
xtension_resource_unittest.cc
xtension_set_unittest.cc
xtension_urls.cc
xtension_urls.h
xtension_utility_messages.h
xtensions_client.h
eature_switch.cc
eature_switch.h
eatures/base_feature_provider_unittest.cc
eatures/complex_feature_unittest.cc
eatures/simple_feature_unittest.cc
ile_util.cc
ile_util_unittest.cc
uest_view/guest_view_constants.cc
uest_view/guest_view_constants.h
anifest.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/background_info.cc
anifest_handlers/background_info.h
anifest_handlers/externally_connectable.cc
anifest_handlers/externally_connectable.h
anifest_handlers/externally_connectable_unittest.cc
anifest_handlers/file_handler_manifest_unittest.cc
anifest_handlers/icons_handler.cc
anifest_handlers/launcher_page_info.cc
anifest_handlers/launcher_page_info.h
anifest_handlers/options_page_info.cc
anifest_handlers/options_page_info.h
anifest_handlers/shared_module_manifest_unittest.cc
anifest_test.cc
anifest_test.h
ermissions/api_permission.h
ermissions/api_permission_set_unittest.cc
ermissions/extensions_api_permissions.cc
ermissions/manifest_permission_set_unittest.cc
ermissions/permission_message.h
ermissions/permission_message_util.cc
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/permissions_data_unittest.cc
ermissions/socket_permission_data.cc
ermissions/socket_permission_unittest.cc
ermissions/usb_device_permission_unittest.cc
tack_frame_unittest.cc
witches.cc
witches.h
est_util.cc
est_util.h
pdate_manifest.h
rl_pattern_unittest.cc
ser_script.h
03b57e008b61dfcb1fbad3aea950ae0e001748b0 28-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 291560

This commit was generated by merge_to_master.py.

Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
UILD.gn
pi/_api_features.json
pi/_permission_features.json
pi/storage.json
sp_validator.cc
sp_validator_unittest.cc
xtension.cc
xtension.h
xtension_messages.h
xtension_resource_unittest.cc
d_util.cc
d_util.h
d_util_unittest.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/externally_connectable.cc
anifest_handlers/shared_module_info.cc
ermissions/extensions_api_permissions.cc
ermissions/permissions_data_unittest.cc
witches.cc
witches.h
ser_script.cc
ser_script.h
6e8cce623b6e4fe0c9e4af605d675dd9d0338c38 19-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 290040

This commit was generated by merge_to_master.py.

Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
UILD.gn
EPS
pi/BUILD.gn
pi/_api_features.json
pi/_permission_features.json
pi/api.gyp
pi/app_runtime.idl
pi/cast_channel.idl
pi/usb_private.idl
ommon_manifest_handlers.cc
onstants.h
rx_file.cc
rx_file.h
sp_validator.cc
xtension.cc
xtension.h
xtension_icon_set.cc
xtension_icon_set.h
d_util.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/icons_handler.cc
anifest_handlers/nacl_modules_handler.cc
anifest_handlers/nacl_modules_handler.h
essage_bundle.cc
ermissions/api_permission.h
ermissions/permission_message.h
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/socket_permission_entry.cc
witches.cc
witches.h
est_util.cc
est_util.h
pdate_manifest.cc
pdate_manifest.h
rl_pattern.cc
rl_pattern.h
rl_pattern_set.cc
rl_pattern_set.h
rl_pattern_set_unittest.cc
rl_pattern_unittest.cc
ser_script.cc
ser_script.h
iew_type.cc
iew_type.h
5f1c94371a64b3196d4be9466099bb892df9b88e 12-Aug-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 288042

This commit was generated by merge_to_master.py.

Change-Id: I583602ff16d735199f1810565c9296e970ce2854
UILD.gn
pi/BUILD.gn
pi/_api_features.json
pi/_permission_features.json
pi/api.gyp
pi/cast_channel.idl
pi/hid.idl
pi/socket.idl
pi/sockets/sockets_manifest_permission.cc
pi/sockets/sockets_manifest_permission.h
pi/sockets_tcp.idl
pi/test.json
vent_filter_unittest.cc
xtension.h
xtension_api.cc
xtension_api.h
xtension_api_stub.cc
xtension_messages.h
eatures/api_feature.cc
eatures/api_feature.h
eatures/complex_feature.cc
eatures/complex_feature.h
eatures/complex_feature_unittest.cc
eatures/feature.h
eatures/simple_feature.cc
eatures/simple_feature.h
eatures/simple_feature_unittest.cc
ermissions/api_permission.h
ermissions/extensions_api_permissions.cc
ermissions/manifest_permission.cc
ermissions/manifest_permission.h
ermissions/manifest_permission_set_unittest.cc
ermissions/permission_message.h
ermissions/permission_message_util.cc
ermissions/permission_set.cc
ermissions/permissions_data.cc
ermissions/permissions_data_unittest.cc
rl_pattern.cc
rl_pattern.h
rl_pattern_set.cc
rl_pattern_set.h
rl_pattern_unittest.cc
ser_script.h
116680a4aac90f2aa7413d9095a592090648e557 21-Jul-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 284076

This commit was generated by merge_to_master.py.

Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
d_injection_constants.cc
d_injection_constants.h
pi/BUILD.gn
pi/_api_features.json
pi/_permission_features.json
pi/api.gyp
pi/app_runtime.idl
pi/app_view_internal.json
pi/power.idl
pi/runtime.json
pi/serial.idl
pi/test.json
xtension.cc
xtension.h
xtension_api.cc
xtension_api.h
xtension_api_stub.cc
xtension_messages.cc
xtension_messages.h
eature_switch.cc
eature_switch.h
eatures/api_feature.cc
eatures/complex_feature.cc
eatures/complex_feature.h
eatures/complex_feature_unittest.cc
eatures/feature.h
eatures/manifest_feature.cc
eatures/permission_feature.cc
eatures/simple_feature.cc
eatures/simple_feature.h
eatures/simple_feature_unittest.cc
d_util.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/background_info.cc
anifest_handlers/file_handler_info.cc
anifest_handlers/file_handler_info.h
anifest_handlers/file_handler_manifest_unittest.cc
ermissions/api_permission.h
ermissions/extensions_api_permissions.cc
ermissions/permission_message.h
ermissions/permission_set.cc
ermissions/permission_set.h
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/permissions_data_unittest.cc
witches.cc
witches.h
rl_pattern.cc
rl_pattern.h
rl_pattern_set.cc
rl_pattern_set.h
rl_pattern_set_unittest.cc
rl_pattern_unittest.cc
ser_script.h
6d86b77056ed63eb6871182f42a9fd5f07550f90 25-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278856

This commit was generated by merge_to_master.py.

Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
pi/api.gyp
ommon_manifest_handlers.cc
f8ee788a64d60abd8f2d742a5fdedde054ecd910 20-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 278205

This commit was generated by merge_to_master.py.

Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
WNERS
pi/runtime.json
xtension_l10n_util.cc
xtension_messages.h
anifest_constants.cc
anifest_constants.h
ermissions/api_permission.h
ermissions/extensions_api_permissions.cc
ermissions/permission_message.h
46d4c2bc3267f3f028f39e7e311b0f89aba2e4fd 09-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 275586

This commit was generated by merge_to_master.py.

Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
sp_validator.cc
xtension.cc
xtension.h
xtension_api.cc
xtension_messages.cc
xtension_messages.h
xtension_set.h
eatures/permission_feature.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/background_info.cc
anifest_handlers/externally_connectable.cc
anifest_handlers/externally_connectable_unittest.cc
anifest_handlers/offline_enabled_info.cc
anifest_handlers/permissions_parser.cc
anifest_handlers/permissions_parser.h
anifest_handlers/shared_module_info.cc
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/permissions_data_unittest.cc
rl_pattern.cc
ser_script.cc
ser_script.h
ser_script_unittest.cc
cedac228d2dd51db4b79ea1e72c7f249408ee061 03-Jun-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 273901

This commit was generated by merge_to_master.py.

Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
d_injection_constants.cc
d_injection_constants.h
pi/_permission_features.json
pi/runtime.json
ommon_manifest_handlers.cc
onstants.cc
onstants.h
om_action_types.h
xtension.cc
xtension.h
xtension_api.cc
xtension_api.h
xtension_icon_set.cc
xtension_messages.h
xtensions_client.h
eature_switch.cc
eature_switch.h
eatures/api_feature.h
eatures/base_feature_provider.cc
eatures/base_feature_provider_unittest.cc
eatures/complex_feature.h
eatures/feature_provider.cc
eatures/feature_provider.h
eatures/json_feature_provider_source.cc
eatures/json_feature_provider_source.h
eatures/manifest_feature.h
eatures/permission_feature.h
eatures/simple_feature.cc
ile_util.cc
ile_util.h
nstall_warning.h
anifest.cc
anifest.h
anifest_constants.cc
anifest_constants.h
anifest_handler.cc
anifest_handler_unittest.cc
anifest_handlers/file_handler_info.cc
anifest_handlers/file_handler_info.h
anifest_handlers/file_handler_manifest_unittest.cc
anifest_handlers/shared_module_info.cc
ermissions/api_permission.h
ermissions/permission_message_util.cc
ermissions/permission_set.cc
ermissions/permission_set.h
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/permissions_data_unittest.cc
ermissions/socket_permission_entry.cc
witches.cc
witches.h
rl_pattern.cc
rl_pattern.h
rl_pattern_set.cc
ser_script.cc
ser_script.h
0de6073388f4e2780db8536178b129cd8f6ab386 15-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269467

This commit was generated by merge_to_master.py.

Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
onstants.h
010d83a9304c5a91596085d917d248abff47903a 14-May-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 269336

This commit was generated by merge_to_master.py.

Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
d_injection_constants.cc
d_injection_constants.h
pi/_api_features.json
pi/_manifest_features.json
pi/_permission_features.json
pi/api.gyp
pi/extensions_manifest_types.json
pi/runtime.json
pi/test.json
pi/usb.idl
xtension.h
xtension_api.cc
xtensions_client.h
eatures/complex_feature.cc
eatures/complex_feature.h
eatures/feature.h
eatures/simple_feature.cc
eatures/simple_feature.h
eatures/simple_feature_unittest.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/externally_connectable.cc
anifest_handlers/externally_connectable.h
anifest_handlers/externally_connectable_unittest.cc
anifest_handlers/shared_module_info.cc
anifest_handlers/shared_module_info.h
anifest_handlers/shared_module_manifest_unittest.cc
ermissions/api_permission.cc
ermissions/api_permission.h
ermissions/extensions_api_permissions.cc
ermissions/extensions_api_permissions.h
ermissions/permissions_info.cc
ermissions/permissions_info.h
ermissions/permissions_provider.h
ermissions/socket_permission_entry.cc
witches.cc
witches.h
rl_pattern.cc
5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 01-May-2014 Bo Liu <boliu@google.com> Merge from Chromium at DEPS revision 267519

This commit was generated by merge_to_master.py.

Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
d_injection_constants.cc
d_injection_constants.h
pi/BUILD.gn
pi/_api_features.json
pi/_manifest_features.json
pi/_permission_features.json
om_action_types.h
xtension_api.cc
xtensions_client.h
eatures/base_feature_provider.cc
eatures/base_feature_provider.h
eatures/base_feature_provider_unittest.cc
eatures/feature_provider.cc
eatures/json_feature_provider_source.cc
eatures/json_feature_provider_source.h
anifest_handlers/icons_handler.cc
anifest_handlers/icons_handler.h
ermissions/api_permission.h
ermissions/permission_message.h
ermissions/set_disjunction_permission.h
rl_pattern_set.cc
0529e5d033099cbfc42635f6f6183833b09dff6e 24-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
EPS
pi/sockets/sockets_manifest_permission.cc
sp_validator.cc
vent_filter.cc
vent_filter_unittest.cc
xtension.cc
xtension.h
xtension_builder.h
eatures/base_feature_provider_unittest.cc
eatures/complex_feature.cc
eatures/complex_feature.h
eatures/complex_feature_unittest.cc
eatures/feature.cc
eatures/feature.h
eatures/simple_feature.cc
eatures/simple_feature.h
eatures/simple_feature_filter.cc
eatures/simple_feature_filter.h
eatures/simple_feature_unittest.cc
ile_util.cc
ile_util_unittest.cc
anifest.cc
anifest_handlers/background_info.cc
anifest_handlers/icons_handler.cc
anifest_handlers/requirements_info.cc
anifest_handlers/requirements_info.h
essage_bundle.h
ermissions/media_galleries_permission.cc
ermissions/permission_message_util.cc
ermissions/permissions_data.cc
ermissions/permissions_data_unittest.cc
ermissions/settings_override_permission.cc
ermissions/socket_permission.cc
ermissions/usb_device_permission.cc
iew_type.cc
iew_type.h
a02191e04bc25c4935f804f2c080ae28663d096d 16-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 263965

This commit was generated by merge_to_master.py.

Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
xtension_api.cc
xtension_messages.h
xtension_set.cc
xtension_set.h
xtensions_client.h
ile_util.cc
ile_util.h
ile_util_unittest.cc
ermissions/api_permission.h
ermissions/media_galleries_permission.cc
ermissions/permission_set.cc
rl_pattern.h
alue_counter.cc
alue_counter.h
c5cede9ae108bb15f6b7a8aea21c7e1fefa2834c 10-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 262940

This commit was generated by merge_to_master.py.

Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
pi/api.gyp
pi/test.json
onstants.cc
onstants.h
rx_file.h
sp_validator.cc
xtension.cc
xtension_api.cc
xtension_api.h
xtension_icon_set.cc
xtension_icon_set.h
xtension_l10n_util.cc
xtension_l10n_util.h
xtension_l10n_util_unittest.cc
xtension_messages.cc
eature_switch.cc
eatures/api_feature.cc
eatures/api_feature.h
eatures/base_feature_provider.cc
eatures/base_feature_provider.h
eatures/base_feature_provider_unittest.cc
eatures/complex_feature.cc
eatures/complex_feature.h
eatures/complex_feature_unittest.cc
eatures/manifest_feature.cc
eatures/manifest_feature.h
eatures/permission_feature.cc
eatures/permission_feature.h
eatures/simple_feature.cc
eatures/simple_feature.h
eatures/simple_feature_filter.cc
eatures/simple_feature_filter.h
eatures/simple_feature_unittest.cc
ile_util.cc
ile_util.h
anifest_handler_helpers.cc
anifest_handler_helpers.h
anifest_handlers/icons_handler.cc
anifest_handlers/icons_handler.h
essage_bundle.cc
essage_bundle.h
essage_bundle_unittest.cc
ermissions/api_permission.cc
ermissions/api_permission.h
ermissions/api_permission_set.cc
ermissions/api_permission_set_unittest.cc
ermissions/media_galleries_permission.cc
ermissions/media_galleries_permission.h
ermissions/set_disjunction_permission.h
ermissions/settings_override_permission.cc
ermissions/settings_override_permission.h
tack_frame.h
witches.cc
witches.h
rl_pattern_set.h
rl_pattern_set_unittest.cc
rl_pattern_unittest.cc
ser_script_unittest.cc
alue_builder.h
e5d81f57cb97b3b6b7fccc9c5610d21eb81db09d 03-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 261286

This commit was generated by merge_to_master.py.

Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
EPS
xtensions_client.h
eatures/feature.h
ne_shot_event.cc
ne_shot_event.h
ermissions/api_permission.h
ermissions/permission_message.h
witches.cc
witches.h
4ad1aa43a48567659193a298fad74f55e00b3dd9 01-Apr-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
pi/api.gyp
pi/extensions_manifest_types.json
pi/sockets/sockets_manifest_data.cc
pi/sockets/sockets_manifest_data.h
pi/sockets/sockets_manifest_handler.cc
pi/sockets/sockets_manifest_handler.h
pi/sockets/sockets_manifest_permission.cc
pi/sockets/sockets_manifest_permission.h
pi/sockets/sockets_manifest_permission_unittest.cc
effb81e5f8246d0db0270817048dc992db66e9fb 31-Mar-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 260458

This commit was generated by merge_to_master.py.

Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
EPS
pi/api.gyp
pi/dns.idl
pi/messaging/message.h
xtension_api.cc
xtension_messages.h
eature_switch.cc
anifest_constants.cc
anifest_constants.h
ermissions/PRESUBMIT.py
ermissions/api_permission.h
ermissions/media_galleries_permission.cc
ermissions/media_galleries_permission.h
ermissions/media_galleries_permission_data.cc
ermissions/media_galleries_permission_data.h
ermissions/permission_message.h
ermissions/permission_message_util.cc
ermissions/permission_message_util.h
ermissions/permissions_data_unittest.cc
ermissions/set_disjunction_permission.h
ermissions/settings_override_permission.cc
ermissions/settings_override_permission.h
ermissions/socket_permission.cc
ermissions/socket_permission.h
ermissions/socket_permission_data.cc
ermissions/socket_permission_data.h
ermissions/socket_permission_entry.cc
ermissions/socket_permission_entry.h
ermissions/usb_device_permission.cc
ermissions/usb_device_permission.h
ermissions/usb_device_permission_data.cc
ermissions/usb_device_permission_data.h
witches.cc
witches.h
23730a6e56a168d1879203e4b3819bb36e3d8f1f 21-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
EPS
WNERS
pi/socket.idl
pi/sockets_tcp.idl
pi/sockets_tcp_server.idl
pi/sockets_udp.idl
xtension.h
xtension_messages.cc
xtension_messages.h
xtension_paths.cc
anifest_handlers/requirements_info.cc
anifest_handlers/requirements_info.h
a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 18-Mar-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 257591

This commit was generated by merge_to_master.py.

Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
EPS
pi/README
pi/api.gyp
pi/socket.idl
pi/sockets_tcp.idl
pi/sockets_tcp_server.idl
pi/sockets_udp.idl
pi/storage.json
xtension.cc
xtension.h
xtension_api.cc
xtension_message_generator.cc
xtension_message_generator.h
xtension_messages.cc
xtension_messages.h
xtension_resource_unittest.cc
xtensions_client.h
eature_switch.cc
eature_switch.h
ile_util_unittest.cc
anifest.cc
anifest_constants.cc
anifest_constants.h
anifest_handlers/background_info.cc
anifest_handlers/background_info.h
anifest_handlers/offline_enabled_info.cc
ermissions/api_permission.h
ermissions/api_permission_set_unittest.cc
ermissions/manifest_permission_set_unittest.cc
ermissions/permission_message.h
ermissions/permissions_data.cc
witches.cc
witches.h
est_util.cc
est_util.h
iew_type.cc
iew_type.h
5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 21-Feb-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 251904

This commit was generated by merge_to_master.py.

Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
ommon_manifest_handlers.cc
ommon_manifest_handlers.h
onstants.cc
onstants.h
rror_utils.cc
rror_utils.h
vent_filter.cc
vent_filter.h
vent_filter_unittest.cc
vent_filtering_info.cc
xtension.cc
xtension.h
xtension_api.cc
xtension_api.h
xtension_api_stub.cc
xtension_set.cc
xtension_set.h
xtension_set_unittest.cc
xtensions_client.cc
xtensions_client.h
eature_switch.cc
eature_switch.h
eatures/feature.h
eatures/feature_provider.h
anifest.cc
anifest.h
anifest_constants.cc
anifest_constants.h
anifest_handler.cc
anifest_handler.h
anifest_handler_unittest.cc
anifest_handlers/background_info.cc
anifest_handlers/background_info.h
anifest_handlers/csp_info.cc
anifest_handlers/csp_info.h
anifest_handlers/incognito_info.cc
anifest_handlers/incognito_info.h
anifest_handlers/kiosk_mode_info.cc
anifest_handlers/kiosk_mode_info.h
anifest_handlers/offline_enabled_info.cc
anifest_handlers/offline_enabled_info.h
anifest_handlers/requirements_info.cc
anifest_handlers/requirements_info.h
anifest_handlers/sandboxed_page_info.cc
anifest_handlers/sandboxed_page_info.h
anifest_handlers/shared_module_info.cc
anifest_handlers/shared_module_info.h
anifest_handlers/web_accessible_resources_info.cc
anifest_handlers/web_accessible_resources_info.h
anifest_handlers/webview_info.cc
anifest_handlers/webview_info.h
atcher/OWNERS
atcher/regex_set_matcher.cc
atcher/regex_set_matcher.h
atcher/regex_set_matcher_unittest.cc
atcher/string_pattern.cc
atcher/string_pattern.h
atcher/string_pattern_unittest.cc
atcher/substring_set_matcher.cc
atcher/substring_set_matcher.h
atcher/substring_set_matcher_unittest.cc
atcher/url_matcher.cc
atcher/url_matcher.h
atcher/url_matcher_constants.cc
atcher/url_matcher_constants.h
atcher/url_matcher_factory.cc
atcher/url_matcher_factory.h
atcher/url_matcher_factory_unittest.cc
atcher/url_matcher_helpers.cc
atcher/url_matcher_helpers.h
atcher/url_matcher_unittest.cc
ne_shot_event.cc
ne_shot_event.h
ermissions/api_permission.cc
ermissions/api_permission.h
ermissions/api_permission_set.cc
ermissions/api_permission_set.h
ermissions/api_permission_set_unittest.cc
ermissions/manifest_permission_set.cc
ermissions/manifest_permission_set.h
ermissions/permission_message.cc
ermissions/permission_message.h
ermissions/permission_message_provider.h
ermissions/permission_set.cc
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/permissions_data_unittest.cc
ermissions/permissions_info.cc
tack_frame_unittest.cc
witches.cc
witches.h
est_util.cc
est_util.h
rl_pattern.cc
rl_pattern_set.cc
alue_builder.cc
alue_builder.h
iew_type.h
a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 18-Dec-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 240154

This commit was generated by merge_to_master.py.

Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
onstants.h
xtension.cc
xtension_resource_unittest.cc
ile_util_unittest.cc
anifest_handlers/csp_info.cc
ermissions/api_permission.h
witches.cc
rl_pattern.cc
f2477e01787aa58f445919b809d89e252beef54f 28-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 237746

This commit was generated by merge_to_master.py.

Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
EPS
onstants.h
sp_validator.cc
sp_validator.h
sp_validator_unittest.cc
xtension.cc
xtension.h
xtension_api.cc
xtension_builder.cc
xtension_builder.h
xtension_resource_unittest.cc
xtensions_client.h
eature_switch.cc
eature_switch.h
ile_util.cc
ile_util.h
ile_util_unittest.cc
anifest_constants.cc
anifest_constants.h
anifest_handler.cc
anifest_handler.h
anifest_handler_unittest.cc
anifest_handlers/background_info.cc
anifest_handlers/background_info.h
anifest_handlers/csp_info.cc
anifest_handlers/csp_info.h
anifest_handlers/incognito_info.cc
anifest_handlers/incognito_info.h
anifest_handlers/kiosk_mode_info.cc
anifest_handlers/kiosk_mode_info.h
anifest_handlers/offline_enabled_info.cc
anifest_handlers/offline_enabled_info.h
anifest_handlers/requirements_info.cc
anifest_handlers/requirements_info.h
anifest_handlers/sandboxed_page_info.cc
anifest_handlers/sandboxed_page_info.h
anifest_handlers/shared_module_info.cc
anifest_handlers/shared_module_info.h
anifest_handlers/shared_module_manifest_unittest.cc
ermissions/api_permission.h
ermissions/api_permission_set.cc
ermissions/api_permission_set.h
ermissions/base_set_operators.h
ermissions/manifest_permission.cc
ermissions/manifest_permission.h
ermissions/manifest_permission_set.cc
ermissions/manifest_permission_set.h
ermissions/manifest_permission_set_unittest.cc
ermissions/permission_message.h
ermissions/permission_set.cc
ermissions/permission_set.h
ermissions/permissions_data.cc
ermissions/permissions_data.h
ermissions/permissions_data_unittest.cc
witches.cc
witches.h
alue_builder.cc
alue_builder.h
0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 06-Nov-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232870

This commit was generated by merge_to_master.py.

Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
EPS
xtension_api.cc
xtension_api.h
xtension_api_stub.cc
anifest.h
anifest_constants.cc
anifest_constants.h
ermissions/permission_set.h
1e9bf3e0803691d0a228da41fc608347b6db4340 31-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 232015

This commit was generated by merge_to_master.py.

Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef
xtensions_client.h
anifest_constants.cc
anifest_constants.h
ermissions/api_permission.h
ermissions/permission_message.h
ermissions/permission_set.cc
ermissions/permission_set.h
8bcbed890bc3ce4d7a057a8f32cab53fa534672e 22-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 230120

This commit was generated by merge_to_master.py.

Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042
xtensions_client.cc
xtensions_client.h
eatures/feature.h
ermissions/api_permission.h
ermissions/permission_message.h
ermissions/permission_message_provider.cc
ermissions/permission_message_provider.h
4e180b6a0b4720a9b8e9e959a882386f690f08ff 18-Oct-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea
xtensions_client.h
eatures/feature.cc
eatures/feature.h
eatures/feature_provider.cc
eatures/feature_provider.h
anifest.cc
anifest.h
anifest_constants.cc
anifest_constants.h
ermissions/api_permission.cc
ermissions/api_permission.h
ermissions/api_permission_set.cc
ermissions/api_permission_set.h
ermissions/api_permission_set_unittest.cc
ermissions/permission_message.cc
ermissions/permission_message.h
ermissions/permissions_info.cc
ermissions/permissions_info.h
68043e1e95eeb07d5cae7aca370b26518b0867d6 26-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178
onstants.cc
onstants.h
anifest_constants.cc
anifest_constants.h
rl_pattern.cc
rl_pattern.h
rl_pattern_set.cc
d0247b1b59f9c528cb6df88b4f2b9afaf80d181e 19-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423
anifest_constants.cc
anifest_constants.h
rl_pattern.cc
58537e28ecd584eab876aee8be7156509866d23a 12-Sep-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
EPS
onstants.h
vent_filtering_info.cc
vent_filtering_info.h
vent_matcher.cc
vent_matcher.h
xtension_urls.cc
xtension_urls.h
anifest.cc
anifest_constants.cc
anifest_constants.h
atcher/DEPS
tack_frame.cc
tack_frame.h
tack_frame_unittest.cc
424c4d7b64af9d0d8fd9624f381f469654d5e3d2 30-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
anifest_constants.cc
anifest_constants.h
witches.cc
witches.h
rl_pattern.cc
3551c9c881056c480085172ff9840cab31610854 23-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r219274

This commit was generated by merge_to_master.py.

Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d
eatures/feature.cc
eatures/feature.h
nstall_warning.cc
nstall_warning.h
anifest.cc
anifest.h
anifest_constants.cc
anifest_constants.h
atcher/regex_set_matcher.cc
atcher/url_matcher.cc
ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16 12-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216972

This commit was generated by merge_to_master.py.

Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd
xtensions_client.cc
xtensions_client.h
eatures/feature_provider.cc
eatures/feature_provider.h
ermissions/permissions_provider.h
a36e5920737c6adbddd3e43b760e5de8431db6e0 05-Aug-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r215573

This commit was generated by merge_to_master.py.

Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
witches.cc
witches.h
a3f7b4e666c476898878fa745f637129375cd889 24-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213371

This commit was generated by merge_to_master.py.

Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
onstants.cc
onstants.h
ca12bfac764ba476d6cd062bf1dde12cc64c3f40 23-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213057

This commit was generated by merge_to_master.py.

Change-Id: I3e2e2506eb9b0080157e9c5f133559df3e600388
witches.cc
witches.h
ser_script.cc
ser_script.h
ser_script_unittest.cc
7dbb3d5cf0c15f500944d211057644d6a2f37371 17-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212014

This commit was generated by merge_to_master.py.

Change-Id: Ie0f261e9682cd8abea1eea1e51beab83d5eea21a
vent_filter.cc
vent_filter.h
vent_filter_unittest.cc
vent_filtering_info.h
vent_matcher.cc
vent_matcher.h
xtension_paths.cc
xtension_resource.cc
atcher/regex_set_matcher_unittest.cc
atcher/url_matcher.cc
atcher/url_matcher_factory_unittest.cc
atcher/url_matcher_unittest.cc
rl_pattern.cc
rl_pattern_set.cc
rl_pattern_set_unittest.cc
rl_pattern_unittest.cc
eb525c5499e34cc9c4b825d6d9e75bb07cc06ace 10-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r210036

This commit was generated by merge_to_master.py.

Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
rx_file.cc
rx_file.h
vent_filtering_info.cc
vent_filtering_info.h
vent_matcher.cc
vent_matcher.h
7d4cd473f85ac64c3747c96c277f9e506a0d2246 19-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: I5fbb6854d092096c4d39edc2865a48be1b53c418
atcher/url_matcher_factory.cc
atcher/url_matcher_unittest.cc
5e3f23d412006dc4db4e659864679f29341e113f 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205548

This commit was generated by merge_to_master.py.

Change-Id: I6d3c83f1b6c91aecc6bd4bf93562314356dd44b9
nstall_warning.h
rl_pattern_set.cc
rl_pattern_set.h
868fa2fe829687343ffae624259930155e16dbd8 11-Jun-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r205460

This commit was generated by merge_to_master.py.

Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
rror_utils.cc
rror_utils.h
d_util.cc
atcher/regex_set_matcher.cc
atcher/url_matcher_factory.cc
atcher/url_matcher_factory_unittest.cc
atcher/url_matcher_unittest.cc
ne_shot_event.cc
ne_shot_event_unittest.cc
rl_pattern.cc
90dce4d38c5ff5333bea97d859d4e484e27edf0c 29-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r202854

This commit was generated by merge_to_master.py.

Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
onstants.cc
onstants.h
atcher/substring_set_matcher.cc
atcher/substring_set_matcher.h
ne_shot_event.cc
ne_shot_event.h
ne_shot_event_unittest.cc
iew_type.h
c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d 09-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I951118a03836157090561764dd2627f0add8118f
xtension_paths.cc
xtension_paths.h
xtension_resource.cc
xtension_resource_unittest.cc
atcher/regex_set_matcher.cc
atcher/regex_set_matcher.h
atcher/substring_set_matcher_unittest.cc
atcher/url_matcher.cc
atcher/url_matcher.h
atcher/url_matcher_constants.cc
atcher/url_matcher_constants.h
atcher/url_matcher_factory.cc
atcher/url_matcher_factory_unittest.cc
atcher/url_matcher_unittest.cc
rl_pattern.cc
iew_type.cc
iew_type.h
2a99a7e74a7f215066514fe81d2bfa6639d9eddd 28-Mar-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170
onstants.cc
onstants.h
rx_file.cc
rx_file.h
raggable_region.cc
raggable_region.h
rror_utils.cc
rror_utils.h
vent_filter.cc
vent_filter.h
vent_filter_unittest.cc
vent_filtering_info.cc
vent_filtering_info.h
vent_matcher.cc
vent_matcher.h
xtension_resource.cc
xtension_resource.h
xtension_resource_unittest.cc
d_util.cc
d_util.h
d_util_unittest.cc
nstall_warning.cc
nstall_warning.h
atcher/DEPS
atcher/OWNERS
atcher/regex_set_matcher.cc
atcher/regex_set_matcher.h
atcher/regex_set_matcher_unittest.cc
atcher/string_pattern.cc
atcher/string_pattern.h
atcher/string_pattern_unittest.cc
atcher/substring_set_matcher.cc
atcher/substring_set_matcher.h
atcher/substring_set_matcher_unittest.cc
atcher/url_matcher.cc
atcher/url_matcher.h
atcher/url_matcher_constants.cc
atcher/url_matcher_constants.h
atcher/url_matcher_factory.cc
atcher/url_matcher_factory.h
atcher/url_matcher_factory_unittest.cc
atcher/url_matcher_helpers.cc
atcher/url_matcher_helpers.h
atcher/url_matcher_unittest.cc
rl_pattern.cc
rl_pattern.h
rl_pattern_set.cc
rl_pattern_set.h
rl_pattern_set_unittest.cc
rl_pattern_unittest.cc