• Home
  • History
  • Annotate
  • only in /external/chromium_org/chrome/common/extensions/permissions/
History log of /external/chromium_org/chrome/common/extensions/permissions/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
ermissions_data_unittest.cc
ettings_override_permission_unittest.cc
ocket_permission_unittest.cc
sb_device_permission_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
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
hrome_permission_message_provider.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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
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
ermission_set_unittest.cc
ettings_override_permission_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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
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
hrome_api_permissions.cc
ermission_set_unittest.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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
ermission_set_unittest.cc
sb_device_permission_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
edia_galleries_permission_unittest.cc
ermission_set_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
edia_galleries_permission_unittest.cc
ermission_set_unittest.cc
ocket_permission_unittest.cc
sb_device_permission_unittest.cc
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
hrome_api_permissions.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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_data.cc
edia_galleries_permission_data.h
edia_galleries_permission_unittest.cc
ermission_message_util.cc
ermission_message_util.h
ermission_set_unittest.cc
et_disjunction_permission.h
ettings_override_permission.cc
ettings_override_permission.h
ettings_override_permission_unittest.cc
ocket_permission.cc
ocket_permission.h
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_entry.cc
ocket_permission_entry.h
ocket_permission_unittest.cc
sb_device_permission.cc
sb_device_permission.h
sb_device_permission_data.cc
sb_device_permission_data.h
sb_device_permission_unittest.cc
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
hrome_api_permissions.cc
edia_galleries_permission_data.cc
ermission_set_unittest.cc
et_disjunction_permission.h
ettings_override_permission_unittest.cc
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
luetooth_permission.cc
luetooth_permission.h
luetooth_permission_data.cc
luetooth_permission_data.h
hrome_api_permissions.cc
hrome_permission_message_provider.cc
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_data.cc
edia_galleries_permission_unittest.cc
ermission_message_util.cc
ermission_set_unittest.cc
et_disjunction_permission.h
ettings_override_permission.cc
ettings_override_permission.h
ettings_override_permission_unittest.cc
ocket_permission.cc
ocket_permission_data.h
ocket_permission_entry.h
ocket_permission_unittest.cc
sb_device_permission.cc
sb_device_permission_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
hrome_permission_message_provider.h
ermission_message_util.cc
ermission_set_unittest.cc
ettings_override_permission_unittest.cc
ocket_permission.cc
ocket_permission_entry.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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
hrome_permission_message_provider.h
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_data.cc
edia_galleries_permission_unittest.cc
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data.h
ermissions_data_unittest.cc
ettings_override_permission.cc
ettings_override_permission.h
ettings_override_permission_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
hrome_scheme_hosts.cc
hrome_scheme_hosts.h
ermission_message_util.cc
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data_unittest.cc
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
hrome_api_permissions.cc
hrome_permission_message_provider.cc
hrome_permission_message_provider.h
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_unittest.cc
ermission_message_util.cc
ermission_message_util.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.cc
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
pi_permission.cc
pi_permission.h
pi_permission_set.cc
pi_permission_set.h
pi_permission_set_unittest.cc
luetooth_permission.cc
luetooth_permission.h
luetooth_permission_data.h
hrome_api_permissions.cc
hrome_scheme_hosts.cc
hrome_scheme_hosts.h
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_data.h
edia_galleries_permission_unittest.cc
ermission_message.cc
ermission_message.h
ermission_message_util.cc
ermission_message_util.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data.h
ermissions_data_unittest.cc
ermissions_info.cc
ermissions_info.h
et_disjunction_permission.h
ocket_permission.cc
ocket_permission.h
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_entry.cc
ocket_permission_unittest.cc
sb_device_permission.cc
sb_device_permission.h
sb_device_permission_data.cc
sb_device_permission_data.h
sb_device_permission_unittest.cc
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
pi_permission.h
hrome_api_permissions.cc
ermission_message.cc
ermission_set_unittest.cc
ermissions_data_unittest.cc
ocket_permission.cc
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_entry.cc
ocket_permission_entry.h
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
pi_permission.h
pi_permission_set.cc
hrome_api_permissions.cc
ermission_message.cc
ermission_message.h
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data_unittest.cc
ocket_permission.cc
ocket_permission.h
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_unittest.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
pi_permission.h
pi_permission_set.cc
pi_permission_set.h
pi_permission_set_unittest.cc
hrome_api_permissions.cc
ermission_message.h
ermission_set.cc
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data_unittest.cc
sb_device_permission_data.cc
sb_device_permission_data.h
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
pi_permission.h
hrome_api_permissions.cc
ermission_message.cc
ermission_message.h
ermissions_data_unittest.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
pi_permission.h
hrome_api_permissions.cc
ermission_message.cc
ermission_message.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.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
hrome_api_permissions.cc
hrome_api_permissions.h
ermission_set_unittest.cc
ermissions_data_unittest.cc
ermissions_info.cc
ermissions_info.h
coped_testing_permissions_info.cc
coped_testing_permissions_info.h
sb_device_permission_unittest.cc
bb1529ce867d8845a77ec7cdf3e3003ef1771a40 08-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216370

This commit was generated by merge_to_master.py.

Change-Id: I739228187a6f1df6c28c5761160e593a49891113
pi_permission.h
hrome_api_permissions.cc
ermission_set_unittest.cc
3240926e260ce088908e02ac07a6cf7b0c0cbf44 07-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r216133

This commit was generated by merge_to_master.py.

Change-Id: I541d5d1d8520b6b3829fbc1fa18552bf9ad4a5c7
hrome_api_permissions.cc
ermission_message.h
ermission_set_unittest.cc
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
pi_permission.h
hrome_api_permissions.cc
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data.h
ermissions_data_unittest.cc
558790d6acca3451cf3a6b497803a5f07d0bec58 30-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r214332

This commit was generated by merge_to_master.py.

Change-Id: I82a7c38de906244dc882493568013be659aa65d1
pi_permission.h
hrome_api_permissions.cc
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_data.cc
edia_galleries_permission_unittest.cc
ermission_message.h
ermission_set.cc
ermission_set_unittest.cc
58e6fbe4ee35d65e14b626c557d37565bf8ad179 26-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r213780

This commit was generated by merge_to_master.py.

Change-Id: I9cf93efc460166e8ae27c76302af9095b402a90e
pi_permission.h
hrome_api_permissions.cc
ermission_message.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
pi_permission.h
hrome_api_permissions.cc
ermission_set_unittest.cc
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
pi_permission.h
pi_permission_set.cc
pi_permission_set.h
hrome_api_permissions.cc
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data_unittest.cc
9ab5563a3196760eb381d102cbb2bc0f7abc6a50 18-Jul-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r212225

This commit was generated by merge_to_master.py.

Change-Id: I9b658b6bade7aff6166611a04fb26f4bcf0ca77c
pi_permission.h
hrome_api_permissions.cc
ermission_set_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
pi_permission.h
hrome_api_permissions.cc
hrome_scheme_hosts.cc
hrome_scheme_hosts.h
ermission_message.cc
ermission_message.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data.h
ermissions_data_unittest.cc
ermissions_info.cc
ermissions_info.h
ocket_permission_data.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
pi_permission.h
luetooth_device_permission.cc
luetooth_device_permission.h
luetooth_device_permission_data.cc
luetooth_device_permission_data.h
luetooth_permission.cc
luetooth_permission.h
luetooth_permission_data.cc
luetooth_permission_data.h
hrome_api_permissions.cc
ermission_message.h
ermission_set_unittest.cc
ocket_permission_data.cc
ocket_permission_unittest.cc
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
pi_permission.cc
pi_permission.h
pi_permission_set.cc
hrome_api_permissions.cc
ermission_message.h
ermission_set_unittest.cc
ermissions_data.cc
et_disjunction_permission.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
pi_permission.h
luetooth_device_permission.cc
hrome_api_permissions.cc
edia_galleries_permission.cc
edia_galleries_permission_data.cc
ermission_message.cc
ermission_message.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data.h
ermissions_data_unittest.cc
ermissions_info.cc
ocket_permission.cc
ocket_permission_data.cc
sb_device_permission.cc
sb_device_permission.h
sb_device_permission_data.cc
sb_device_permission_data.h
sb_device_permission_unittest.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
pi_permission.h
hrome_api_permissions.cc
ermission_set.cc
ermission_set_unittest.cc
ermissions_data.cc
ermissions_data.h
ermissions_data_unittest.cc
sb_device_permission.cc
sb_device_permission_unittest.cc
a93a17c8d99d686bd4a1511e5504e5e6cc9fcadf 15-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I85f3a249ae157fd8253431215fb2dfcd12ee9bf3
ermission_set.cc
b2df76ea8fec9e32f6f3718986dba0d95315b29c 13-May-2013 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r199464

This commit was generated by merge_to_master.py.

Change-Id: Ic3d1f97a4fb4edd1e6ed66a70b5040da1622b5a9
ermissions_data.cc
ermissions_data.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
pi_permission.cc
pi_permission.h
pi_permission_set.cc
pi_permission_set_unittest.cc
luetooth_device_permission_data.cc
hrome_api_permissions.cc
hrome_api_permissions.h
edia_galleries_permission_unittest.cc
ermission_message.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_info.cc
ermissions_info.h
coped_testing_permissions_info.cc
coped_testing_permissions_info.h
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_unittest.cc
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
pi_permission.cc
pi_permission.h
pi_permission_set.cc
pi_permission_set_unittest.cc
luetooth_device_permission.cc
luetooth_device_permission.h
luetooth_device_permission_data.cc
luetooth_device_permission_data.h
edia_galleries_permission.cc
edia_galleries_permission.h
edia_galleries_permission_data.cc
edia_galleries_permission_data.h
edia_galleries_permission_unittest.cc
ermission_message.cc
ermission_message.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
et_disjunction_permission.h
ocket_permission.cc
ocket_permission.h
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_unittest.cc
sb_device_permission.cc
sb_device_permission.h
sb_device_permission_data.cc
sb_device_permission_data.h
5821806d5e7f356e8fa4b058a389a808ea183019 14-Nov-2012 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision r167172

This commit was generated by merge_to_master.py.

Change-Id: Ib8d56fd5ae39a2d7e8c91dcd76cc6d13f25f2aab
pi_permission.cc
pi_permission.h
pi_permission_set.cc
pi_permission_set.h
pi_permission_set_unittest.cc
ermission_message.cc
ermission_message.h
ermission_set.cc
ermission_set.h
ermission_set_unittest.cc
ermissions_info.cc
ermissions_info.h
ocket_permission.cc
ocket_permission.h
ocket_permission_data.cc
ocket_permission_data.h
ocket_permission_unittest.cc