| 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
iosk_mode_screensaver.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
iosk_mode_idle_logout.cc
iosk_mode_idle_logout_unittest.cc
iosk_mode_settings.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
iosk_mode_screensaver.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
iosk_mode_idle_logout.cc
iosk_mode_idle_logout_unittest.cc
iosk_mode_screensaver.cc
iosk_mode_settings.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
iosk_mode_screensaver.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
iosk_mode_screensaver.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
iosk_mode_idle_logout.cc
iosk_mode_idle_logout.h
iosk_mode_idle_logout_unittest.cc
iosk_mode_screensaver.cc
iosk_mode_screensaver.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
iosk_mode_screensaver.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
iosk_mode_idle_logout_unittest.cc
iosk_mode_screensaver.cc
iosk_mode_settings.cc
iosk_mode_settings_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
iosk_mode_screensaver.cc
iosk_mode_settings.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
iosk_mode_screensaver.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
iosk_mode_idle_logout.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
iosk_mode_settings.cc
iosk_mode_settings_unittest.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
iosk_mode_screensaver.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
iosk_mode_screensaver.cc
iosk_mode_settings.cc
iosk_mode_settings.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
iosk_mode_idle_logout_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
iosk_mode_idle_logout.cc
iosk_mode_idle_logout_unittest.cc
iosk_mode_settings_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
iosk_mode_idle_logout.cc
iosk_mode_idle_logout.h
iosk_mode_idle_logout_unittest.cc
iosk_mode_screensaver.cc
iosk_mode_screensaver.h
|
| 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
iosk_mode_idle_logout.h
iosk_mode_settings.h
ock_kiosk_mode_settings.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
iosk_mode_screensaver.cc
iosk_mode_settings.cc
|
| 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
iosk_mode_screensaver.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
iosk_mode_settings_unittest.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
iosk_mode_settings.cc
|
| 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
iosk_mode_screensaver.cc
iosk_mode_settings_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
iosk_mode_idle_logout.cc
iosk_mode_idle_logout.h
iosk_mode_idle_logout_unittest.cc
iosk_mode_screensaver.cc
iosk_mode_screensaver.h
iosk_mode_settings.cc
iosk_mode_settings.h
iosk_mode_settings_unittest.cc
|
| 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
WNERS
iosk_mode_idle_logout.cc
iosk_mode_idle_logout.h
iosk_mode_idle_logout_unittest.cc
iosk_mode_screensaver.cc
iosk_mode_screensaver.h
iosk_mode_settings.cc
iosk_mode_settings.h
iosk_mode_settings_unittest.cc
ock_kiosk_mode_settings.cc
ock_kiosk_mode_settings.h
|