• Home
  • History
  • Annotate
  • only in /external/chromium_org/ash/shell/
History log of /external/chromium_org/ash/shell/
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
pp_list.cc
anel_window.cc
anel_window.h
helf_delegate_impl.cc
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
oplevel_window.h
indow_type_launcher.cc
indow_type_launcher.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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_main_delegate.cc
ontext_menu.cc
hell_delegate_impl.cc
hell_main_parts.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
pp_list.cc
eyboard_controller_proxy_stub.cc
eyboard_controller_proxy_stub.h
hell_delegate_impl.cc
indow_type_launcher.cc
indow_watcher.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
pp_list.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
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_content_browser_client.cc
ontent_client/shell_content_browser_client.h
eyboard_controller_proxy_stub.cc
eyboard_controller_proxy_stub.h
ock_view.cc
anel_window.cc
anel_window.h
idgets.cc
indow_type_launcher.cc
indow_watcher.cc
indow_watcher.h
indow_watcher_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
pp_list.cc
hell_delegate_impl.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
pp_list.cc
ock_view.cc
hell_delegate_impl.cc
indow_type_launcher.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
hell_delegate_impl.cc
hell_delegate_impl.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
ontent_client/shell_browser_main_parts.cc
ock_view.cc
hell_delegate_impl.cc
hell_delegate_impl.h
indow_watcher.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
hell_delegate_impl.cc
hell_delegate_impl.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
ontent_client/shell_browser_main_parts.cc
eyboard_controller_proxy_stub.cc
eyboard_controller_proxy_stub.h
indow_watcher_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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_browser_main_parts.h
ontent_client/shell_content_browser_client.cc
ontent_client/shell_content_browser_client.h
eyboard_controller_proxy_stub.cc
ock_view.cc
anel_window.cc
hell_delegate_impl.cc
hell_delegate_impl.h
hell_main.cc
oplevel_window.cc
idgets.cc
indow_type_launcher.cc
indow_watcher.cc
indow_watcher_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
pp_list.cc
ubble.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_browser_main_parts.h
ontext_menu.cc
eyboard_controller_proxy_stub.cc
eyboard_controller_proxy_stub.h
ock_view.cc
anel_window.cc
helf_delegate_impl.cc
helf_delegate_impl.h
hell_delegate_impl.cc
hell_delegate_impl.h
hell_main.cc
oplevel_window.cc
idgets.cc
indow_type_launcher.cc
indow_watcher.cc
indow_watcher.h
indow_watcher_shelf_item_delegate.cc
indow_watcher_shelf_item_delegate.h
indow_watcher_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
pp_list.cc
auncher_delegate_impl.cc
auncher_delegate_impl.h
helf_delegate_impl.cc
helf_delegate_impl.h
hell_delegate_impl.cc
hell_delegate_impl.h
indow_type_launcher.cc
indow_watcher.cc
indow_watcher_launcher_item_delegate.cc
indow_watcher_launcher_item_delegate.h
indow_watcher_shelf_item_delegate.cc
indow_watcher_shelf_item_delegate.h
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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
eyboard_controller_proxy_stub.cc
eyboard_controller_proxy_stub.h
auncher_delegate_impl.cc
auncher_delegate_impl.h
hell_delegate_impl.cc
hell_delegate_impl.h
indow_type_launcher.cc
indow_watcher.cc
indow_watcher.h
indow_watcher_launcher_item_delegate.cc
indow_watcher_launcher_item_delegate.h
indow_watcher_unittest.cc
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
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
oplevel_window.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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
ontext_menu.cc
ontext_menu.h
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
oplevel_window.h
indow_watcher.cc
indow_watcher_launcher_item_delegate.cc
indow_watcher_launcher_item_delegate.h
indow_watcher_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
hell_delegate_impl.cc
hell_delegate_impl.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
EPS
pp_list.cc
ontent_client/DEPS
auncher_delegate_impl.cc
auncher_delegate_impl.h
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
oplevel_window.h
indow_type_launcher.cc
indow_watcher.cc
indow_watcher_launcher_item_delegate.cc
indow_watcher_launcher_item_delegate.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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
auncher_delegate_impl.cc
hell_delegate_impl.cc
oplevel_window.cc
indow_watcher.cc
indow_watcher_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
pp_list.cc
ocoa/app-Info.plist
ocoa/app.icns
ocoa/nibs/MainMenu.xib
ocoa/nibs/RootWindow.xib
ontent_client/shell_browser_main_parts.cc
anel_window.cc
hell_delegate_impl.cc
hell_main_parts_mac.mm
indow_type_launcher.cc
indow_type_launcher.h
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
pp_list.cc
ontext_menu.h
auncher_delegate_impl.cc
auncher_delegate_impl.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
auncher_delegate_impl.cc
auncher_delegate_impl.h
indow_type_launcher.cc
indow_watcher.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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_content_browser_client.cc
auncher_delegate_impl.cc
auncher_delegate_impl.h
hell_delegate_impl.cc
hell_main_parts.cc
hell_main_parts_mac.mm
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
hell_delegate_impl.cc
hell_delegate_impl.h
2385ea399aae016c0806a4f9ef3c9cfe3d2a39df 06-Aug-2013 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision r215849

This commit was generated by merge_to_master.py.

Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
ontext_menu.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
ontent_client/shell_browser_main_parts.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
oplevel_window.cc
oplevel_window.h
indow_type_launcher.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
ontent_client/shell_browser_main_parts.cc
hell_delegate_impl.cc
oplevel_window.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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_browser_main_parts.h
hell_main_parts_mac.mm
indow_type_launcher.cc
indow_watcher_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
auncher_delegate_impl.cc
auncher_delegate_impl.h
indow_type_launcher.cc
indow_type_launcher.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
pp_list.cc
ubble.cc
ontent_client/shell_browser_main_parts.cc
ock_view.cc
anel_window.cc
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
idgets.cc
indow_type_launcher.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
pp_list.cc
ontent_client/shell_browser_main_parts.cc
auncher_delegate_impl.cc
auncher_delegate_impl.h
hell_delegate_impl.cc
hell_delegate_impl.h
indow_type_launcher.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
ontent_client/shell_browser_main_parts.cc
ock_view.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
ontent_client/shell_main_delegate.h
auncher_delegate_impl.cc
auncher_delegate_impl.h
hell_delegate_impl.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
pp_list.cc
ubble.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_content_browser_client.cc
ontent_client/shell_content_browser_client.h
ontent_client/shell_main_delegate.cc
auncher_delegate_impl.cc
auncher_delegate_impl.h
ock_view.cc
anel_window.cc
anel_window.h
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
oplevel_window.h
idgets.cc
indow_type_launcher.cc
indow_type_launcher.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
pp_list.cc
ubble.cc
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_browser_main_parts.h
ontent_client/shell_main_delegate.cc
ontext_menu.cc
ontext_menu.h
auncher_delegate_impl.cc
auncher_delegate_impl.h
ock_view.cc
anel_window.cc
hell_delegate_impl.cc
hell_delegate_impl.h
oplevel_window.cc
idgets.cc
indow_type_launcher.cc
indow_type_launcher.h
indow_watcher.cc
indow_watcher.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
EPS
pp_list.cc
ubble.cc
ocoa/app-Info.plist
ocoa/app.icns
ocoa/nibs/MainMenu.xib
ocoa/nibs/RootWindow.xib
ontent_client/DEPS
ontent_client/shell_browser_main_parts.cc
ontent_client/shell_browser_main_parts.h
ontent_client/shell_content_browser_client.cc
ontent_client/shell_content_browser_client.h
ontent_client/shell_main_delegate.cc
ontent_client/shell_main_delegate.h
ontext_menu.cc
ontext_menu.h
xample_factory.h
auncher_delegate_impl.cc
auncher_delegate_impl.h
ock_view.cc
anel_window.cc
anel_window.h
hell_delegate_impl.cc
hell_delegate_impl.h
hell_main.cc
hell_main_parts.cc
hell_main_parts.h
hell_main_parts_mac.mm
oplevel_window.cc
oplevel_window.h
idgets.cc
indow_type_launcher.cc
indow_type_launcher.h
indow_watcher.cc
indow_watcher.h
indow_watcher_unittest.cc