• Home
  • History
  • Annotate
  • only in /external/chromium_org/ui/app_list/
History log of /external/chromium_org/ui/app_list/
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
iews/apps_grid_view.cc
1675a649fd7a8b3cb80ffddae2dc181f122353c5 22-Oct-2014 Ben Murdoch <benm@google.com> Merge from Chromium at DEPS revision 39.0.2171.37

This commit was generated by merge_to_master.py.

Change-Id: I4ca18a1d6d089e98b0511ad83f49e89d62401760
pp_list_switches.cc
34680572440d7894ef8dafce81d8039ed80726a2 14-Oct-2014 Torne (Richard Coles) <torne@google.com> Merge from Chromium at DEPS revision 39.0.2171.26

This commit was generated by merge_to_master.py.

Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/test/apps_grid_view_test_api.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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_item_list.cc
pp_list_item_list.h
pp_list_item_list_unittest.cc
pp_list_menu.cc
pp_list_model.cc
pp_list_model.h
pp_list_switches.cc
pp_list_switches.h
pp_list_view_delegate_observer.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/app_list_window_controller_unittest.mm
ocoa/apps_search_results_controller.mm
emo/app_list_demo_views.cc
agination_controller.cc
agination_controller.h
agination_model.cc
earch/term_break_iterator.cc
earch/term_break_iterator.h
earch/term_break_iterator_unittest.cc
earch/tokenized_string.cc
earch/tokenized_string.h
earch/tokenized_string_char_iterator.cc
earch/tokenized_string_char_iterator.h
earch/tokenized_string_char_iterator_unittest.cc
earch/tokenized_string_match.cc
earch/tokenized_string_match.h
earch/tokenized_string_match_unittest.cc
earch/tokenized_string_unittest.cc
peech_ui_model.cc
peech_ui_model.h
est/app_list_test_view_delegate.cc
iews/app_list_background.cc
iews/app_list_folder_view.cc
iews/app_list_item_view.cc
iews/app_list_main_view.cc
iews/app_list_main_view_unittest.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/app_list_view_unittest.cc
iews/apps_container_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/contents_view.cc
iews/contents_view.h
iews/folder_header_view.cc
iews/search_box_view.cc
iews/search_box_view.h
iews/search_result_list_view_unittest.cc
iews/search_result_view.cc
iews/search_result_view.h
iews/speech_view.cc
iews/start_page_view.cc
iews/start_page_view.h
iews/tile_item_view.cc
iews/tile_item_view.h
iews/top_icon_animation_view.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
EPS
pp_list.gyp
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_item.cc
pp_list_item_observer.h
pp_list_menu.cc
ocoa/apps_search_box_controller.mm
emo/app_list_demo_views.cc
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_view.cc
iews/app_list_view_unittest.cc
iews/contents_view.cc
iews/folder_background_view.cc
iews/folder_header_view.cc
iews/folder_header_view.h
iews/progress_bar_view.cc
iews/search_box_view.cc
iews/speech_view.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
pp_list_constants.cc
pp_list_constants.h
pp_list_folder_item.cc
pp_list_model.cc
pp_list_model.h
pp_list_view_delegate.h
earch_result.cc
earch_result.h
earch_result_observer.h
est/app_list_test_model.cc
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_background.cc
iews/app_list_folder_view.cc
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_main_view_unittest.cc
iews/app_list_menu_views.cc
iews/app_list_view_unittest.cc
iews/apps_container_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_delegate.h
iews/apps_grid_view_unittest.cc
iews/cached_label.cc
iews/contents_view.cc
iews/search_box_view.cc
iews/search_result_list_view.cc
iews/search_result_view.cc
iews/start_page_view.cc
iews/start_page_view.h
iews/tile_item_view.cc
iews/tile_item_view.h
iews/top_icon_animation_view.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
UILD.gn
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
emo/app_list_demo_views.cc
earch_result.h
iews/app_list_main_view_unittest.cc
iews/app_list_view.cc
iews/app_list_view_unittest.cc
iews/apps_grid_view.cc
iews/apps_grid_view_unittest.cc
iews/cached_label.cc
iews/cached_label.h
iews/folder_header_view.cc
iews/search_box_view_unittest.cc
iews/search_result_list_view_unittest.cc
iews/test/apps_grid_view_test_api.cc
iews/tile_item_view.h
iews/top_icon_animation_view.cc
iews/top_icon_animation_view.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
pp_list_constants.cc
pp_list_constants.h
pp_list_switches.cc
pp_list_switches.h
pp_list_view_delegate.h
ocoa/apps_grid_controller_unittest.mm
est/app_list_test_model.cc
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_background.cc
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_menu_views.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/app_list_view_unittest.cc
iews/apps_grid_view.cc
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/contents_view.cc
iews/contents_view.h
iews/search_result_list_view.cc
iews/search_result_view.cc
iews/speech_view.cc
iews/start_page_view.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
pp_list_constants.cc
pp_list_constants.h
pp_list_switches.cc
pp_list_switches.h
agination_model.cc
agination_model.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view_unittest.cc
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/contents_view.cc
iews/contents_view.h
iews/speech_view.cc
iews/start_page_view.cc
iews/start_page_view.h
iews/test/apps_grid_view_test_api.cc
iews/tile_item_view.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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_switches.cc
pp_list_switches.h
earch_provider.cc
earch_provider.h
earch_result.cc
earch_result.h
peech_ui_model_observer.h
iews/app_list_item_view.cc
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/app_list_view_unittest.cc
iews/apps_grid_view.cc
iews/apps_grid_view_unittest.cc
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/contents_view.cc
iews/contents_view.h
iews/search_box_view.cc
iews/search_result_list_view.cc
iews/speech_view.cc
iews/start_page_view.cc
iews/start_page_view.h
iews/test/apps_grid_view_test_api.cc
iews/test/apps_grid_view_test_api.h
iews/tile_item_view.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.gyp
pp_list_menu.cc
pp_list_model.cc
pp_list_model.h
pp_list_model_unittest.cc
pp_list_switches.cc
pp_list_view_delegate.cc
pp_list_view_delegate.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/scroll_view_with_no_scrollbars.mm
ocoa/signin_view_controller.h
ocoa/signin_view_controller.mm
ocoa/signin_view_controller_unittest.mm
emo/DEPS
emo/app_list_demo_views.cc
ignin_delegate.cc
ignin_delegate.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/DEPS
iews/app_list_demo.cc
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.cc
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_main_view_unittest.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/app_list_view_unittest.cc
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/contents_view.h
iews/folder_header_view_unittest.cc
iews/page_switcher.h
iews/pulsing_block_view.cc
iews/signin_view.cc
iews/signin_view.h
iews/speech_view.cc
iews/start_page_view.cc
iews/start_page_view.h
iews/tile_item_view.cc
iews/tile_item_view.h
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
pp_list.gyp
pp_list_folder_item.cc
pp_list_model.cc
pp_list_model_observer.h
ocoa/apps_grid_controller_unittest.mm
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
est/run_all_unittests.cc
iews/DEPS
iews/app_list_background.cc
iews/app_list_demo.cc
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_main_view_unittest.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/app_list_view_unittest.cc
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/contents_view.cc
iews/contents_view.h
iews/folder_header_view.cc
iews/folder_header_view.h
iews/page_switcher.cc
iews/page_switcher.h
iews/progress_bar_view.cc
iews/progress_bar_view.h
iews/search_box_view.cc
iews/search_box_view.h
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_view.cc
iews/search_result_view.h
iews/speech_view.cc
iews/speech_view.h
iews/speech_view_unittest.cc
iews/start_page_view.cc
iews/start_page_view.h
iews/test/apps_grid_view_test_api.cc
iews/test/apps_grid_view_test_api.h
iews/tile_item_view.cc
iews/tile_item_view.h
iews/top_icon_animation_view.cc
iews/top_icon_animation_view.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
pp_list.gyp
pp_list_model.h
pp_list_switches.cc
pp_list_switches.h
pp_list_view_delegate.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_folder_delegate.h
iews/apps_grid_view_unittest.cc
iews/cached_label.cc
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/folder_header_view.cc
iews/folder_header_view_delegate.h
iews/search_result_view.h
iews/speech_view.cc
iews/top_icon_animation_view.cc
iews/top_icon_animation_view.h
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.gyp
ocoa/app_list_view_controller.mm
ocoa/apps_grid_controller.mm
ocoa/apps_grid_view_item.mm
iews/app_list_item_view.cc
iews/app_list_menu_views.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/folder_header_view.cc
iews/folder_header_view.h
iews/search_result_view.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
pp_list.gyp
pp_list_switches.cc
iews/app_list_item_view.cc
iews/apps_grid_view.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
pp_list_model.cc
pp_list_switches.cc
pp_list_switches.h
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.cc
iews/app_list_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/folder_header_view.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
pp_list_item_list.cc
pp_list_item_list.h
pp_list_menu.cc
pp_list_model.h
pp_list_switches.cc
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_view.cc
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
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
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_folder_delegate.h
iews/apps_grid_view_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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_menu.cc
pp_list_view_delegate.cc
pp_list_view_delegate.h
est/app_list_test_model.cc
est/app_list_test_model.h
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_folder_delegate.h
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/folder_header_view.cc
iews/folder_header_view.h
iews/folder_header_view_delegate.h
iews/folder_header_view_unittest.cc
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
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_model.cc
pp_list_model.h
pp_list_model_unittest.cc
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/folder_header_view.cc
iews/folder_header_view.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
WNERS
RESUBMIT.py
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_item.cc
pp_list_item.h
pp_list_item_list.cc
pp_list_item_list.h
pp_list_item_list_observer.h
pp_list_item_list_unittest.cc
pp_list_item_observer.h
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_model_unittest.cc
pp_list_switches.cc
pp_list_switches.h
ocoa/app_list_view_controller.mm
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.mm
ocoa/test/apps_grid_controller_test_helper.mm
peech_ui_model.cc
est/DEPS
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
est/run_all_unittests.cc
iews/app_list_background.cc
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_container_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/contents_switcher_view.cc
iews/contents_switcher_view.h
iews/contents_view.cc
iews/contents_view.h
iews/folder_background_view.cc
iews/folder_header_view.cc
iews/folder_header_view.h
iews/folder_header_view_delegate.h
iews/search_result_actions_view.cc
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_list_view_delegate.h
iews/search_result_list_view_unittest.cc
iews/search_result_view.cc
iews/search_result_view.h
iews/search_result_view_delegate.h
iews/speech_view.cc
iews/top_icon_animation_view.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
EPS
RESUBMIT.py
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_item.cc
pp_list_item.h
pp_list_item_list.cc
pp_list_item_list.h
pp_list_item_list_observer.h
pp_list_item_list_unittest.cc
pp_list_item_model.cc
pp_list_item_model.h
pp_list_item_model_observer.h
pp_list_item_observer.h
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_model_unittest.cc
pp_list_switches.cc
pp_list_switches.h
pp_list_view_delegate.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_window_controller.mm
ocoa/app_list_window_controller_unittest.mm
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/apps_search_results_controller_unittest.mm
ocoa/signin_view_controller.mm
ocoa/signin_view_controller_unittest.mm
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
earch_box_model.cc
earch_box_model.h
peech_ui_model.cc
peech_ui_model.h
peech_ui_model_observer.h
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
est/run_all_unittests.cc
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_delegate.h
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/contents_view.h
iews/folder_background_view.cc
iews/folder_background_view.h
iews/folder_header_view.cc
iews/folder_header_view.h
iews/pulsing_block_view.cc
iews/search_box_view.cc
iews/search_box_view.h
iews/search_box_view_unittest.cc
iews/search_result_actions_view.cc
iews/search_result_actions_view.h
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_list_view_delegate.h
iews/search_result_list_view_unittest.cc
iews/search_result_view.cc
iews/search_result_view.h
iews/search_result_view_delegate.h
iews/signin_view.cc
iews/signin_view.h
iews/speech_view.cc
iews/speech_view.h
iews/top_icon_animation_view.cc
iews/top_icon_animation_view.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
pp_list.gyp
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_model_unittest.cc
pp_list_view_delegate.h
pp_list_view_delegate_observer.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/app_list_window_controller.mm
ocoa/app_list_window_controller_unittest.mm
ocoa/apps_grid_view_item.mm
ocoa/apps_search_box_controller.mm
ocoa/apps_search_results_controller_unittest.mm
earch_box_model.cc
earch_box_model.h
earch_box_model_observer.h
peech_ui_model.cc
peech_ui_model.h
peech_ui_model_observer.h
est/app_list_test_model.cc
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_main_view_unittest.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/app_list_view_observer.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/folder_header_view.cc
iews/page_switcher.h
iews/search_box_view.cc
iews/search_box_view.h
iews/speech_view.cc
iews/speech_view.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.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_item_list.cc
pp_list_item_list.h
pp_list_item_list_unittest.cc
pp_list_menu.cc
pp_list_menu.h
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_model_unittest.cc
pp_list_switches.cc
pp_list_switches.h
pp_list_view_delegate.cc
pp_list_view_delegate.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_pagination_model_observer.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/item_drag_controller.h
ocoa/signin_view_controller.h
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
earch_box_model.cc
earch_box_model.h
earch_box_model_observer.h
earch_result.h
est/app_list_test_model.cc
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_background.h
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_menu_views.cc
iews/app_list_menu_views.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_delegate.h
iews/contents_view.h
iews/folder_header_view.cc
iews/search_box_view.cc
iews/search_box_view.h
iews/search_result_actions_view.cc
iews/search_result_list_view.h
iews/test/apps_grid_view_test_api.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
pp_list.gyp
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
EPS
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_item_list.cc
pp_list_item_list.h
pp_list_item_list_observer.h
pp_list_item_model.cc
pp_list_item_model.h
pp_list_model.cc
pp_list_model.h
pp_list_model_unittest.cc
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.mm
est/app_list_test_model.cc
est/app_list_test_model.h
iews/app_list_folder_view.cc
iews/app_list_folder_view.h
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_container_view.cc
iews/apps_container_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/contents_view.h
iews/folder_header_view.cc
iews/folder_header_view.h
iews/folder_header_view_delegate.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
ocoa/apps_search_results_controller_unittest.mm
iews/app_list_item_view.cc
iews/search_box_view.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
pp_list.gyp
pp_list_folder_item.cc
pp_list_folder_item.h
pp_list_item_model.cc
pp_list_item_model.h
pp_list_menu.cc
pp_list_menu.h
pp_list_model.cc
pp_list_model.h
pp_list_view_delegate.h
ocoa/app_list_view_controller.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/blue_label_button.h
ocoa/blue_label_button.mm
ocoa/blue_label_button_unittest.mm
ocoa/signin_view_controller.mm
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_item_view.cc
iews/app_list_main_view.cc
iews/app_list_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/contents_view.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
EPS
pp_list.gyp
pp_list_menu.cc
pp_list_menu.h
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_view_delegate.h
ocoa/app_list_view_controller.mm
ocoa/apps_grid_controller.mm
ocoa/apps_grid_view_item.mm
ocoa/apps_search_box_controller.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/blue_label_button.mm
ocoa/current_user_menu_item_view.h
ocoa/current_user_menu_item_view.mm
ocoa/item_drag_controller.mm
agination_model.cc
est/app_list_test_view_delegate.h
iews/app_list_item_view.cc
iews/app_list_main_view.cc
iews/app_list_menu_views.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_grid_view.cc
iews/cached_label.cc
iews/contents_view.cc
iews/contents_view.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
agination_model.cc
agination_model.h
iews/app_list_item_view.cc
iews/apps_grid_view.cc
iews/contents_view.cc
iews/page_switcher.cc
iews/search_box_view.cc
iews/search_result_list_view.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
pp_list_item_model.cc
pp_list_item_model.h
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
earch_result.h
est/app_list_test_model.cc
est/app_list_test_model.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/search_box_view.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
pp_list_item_model.h
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.mm
ocoa/apps_search_results_controller_unittest.mm
ocoa/apps_search_results_model_bridge.mm
earch_result.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.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.gyp
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_view_delegate.h
pps_grid_view_delegate.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
ocoa/apps_search_box_controller.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/apps_search_results_controller.h
ocoa/apps_search_results_controller.mm
ocoa/apps_search_results_controller_unittest.mm
ocoa/apps_search_results_model_bridge.h
ocoa/apps_search_results_model_bridge.mm
ocoa/current_user_menu_item_view.h
ocoa/current_user_menu_item_view.mm
earch_box_view_delegate.h
earch_result_list_view_delegate.h
ignin_delegate.cc
ignin_delegate.h
ignin_delegate_observer.h
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_menu_views.cc
iews/app_list_menu_views.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_delegate.h
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/contents_view.h
iews/page_switcher.cc
iews/search_box_view.cc
iews/search_box_view.h
iews/search_box_view_delegate.h
iews/search_result_list_view.cc
iews/search_result_list_view_delegate.h
iews/search_result_view.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
ocoa/app_list_view_controller.mm
ocoa/apps_search_box_controller.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_results_model_bridge.mm
earch_result.cc
earch_result.h
earch_result_list_view_delegate.h
earch_result_observer.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/search_box_view.cc
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_view.cc
iews/search_result_view.h
iews/search_result_view_delegate.h
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
ocoa/apps_grid_controller.mm
ocoa/apps_grid_view_item.mm
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
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
iews/app_list_main_view.cc
iews/contents_view.cc
iews/contents_view.h
iews/search_box_view.cc
iews/search_box_view.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
ocoa/apps_grid_view_item.mm
ocoa/apps_search_results_model_bridge.mm
earch_result.cc
earch_result.h
earch_result_list_view_delegate.h
earch_result_observer.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_view.cc
iews/search_result_view.h
iews/search_result_view_delegate.h
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
iews/app_list_view.cc
iews/apps_grid_view.cc
iews/search_box_view.cc
iews/search_box_view.h
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
iews/app_list_item_view.cc
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
iews/apps_grid_view.cc
iews/apps_grid_view.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
ocoa/test/apps_grid_controller_test_helper.h
agination_model_unittest.cc
iews/app_list_item_view.cc
iews/apps_grid_view_unittest.cc
iews/search_result_list_view.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
pp_list.gyp
ocoa/app_list_pager_view.mm
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/apps_collection_view_drag_manager.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
ocoa/apps_search_box_controller.mm
ocoa/apps_search_results_controller.mm
ocoa/apps_search_results_controller_unittest.mm
ocoa/apps_search_results_model_bridge.h
ocoa/apps_search_results_model_bridge.mm
ocoa/blue_label_button.h
ocoa/blue_label_button.mm
ocoa/blue_label_button_unittest.mm
ocoa/item_drag_controller.mm
ocoa/signin_view_controller.h
ocoa/signin_view_controller.mm
ocoa/signin_view_controller_unittest.mm
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
agination_model.cc
agination_model.h
agination_model_observer.h
agination_model_unittest.cc
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/page_switcher.cc
iews/page_switcher.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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_view_delegate.h
pps_grid_view_delegate.h
ocoa/app_list_pager_view.mm
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/app_list_window_controller.h
ocoa/app_list_window_controller.mm
ocoa/app_list_window_controller_unittest.mm
ocoa/apps_collection_view_drag_manager.h
ocoa/apps_collection_view_drag_manager.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
ocoa/apps_search_box_controller.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/apps_search_results_controller.h
ocoa/apps_search_results_controller.mm
ocoa/apps_search_results_controller_unittest.mm
ocoa/apps_search_results_model_bridge.h
ocoa/apps_search_results_model_bridge.mm
ocoa/current_user_menu_item_view.mm
ocoa/item_drag_controller.h
ocoa/item_drag_controller.mm
ocoa/scroll_view_with_no_scrollbars.mm
agination_model.h
earch_box_model.cc
earch_result.cc
earch_result.h
earch_result_observer.h
earch_result_view_delegate.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/progress_bar_view.cc
iews/progress_bar_view.h
iews/pulsing_block_view.h
iews/search_result_actions_view.cc
iews/search_result_actions_view.h
iews/search_result_actions_view_delegate.h
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_view.cc
iews/search_result_view.h
iews/search_result_view_delegate.h
iews/signin_view.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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_menu.cc
pp_list_menu.h
pp_list_view_delegate.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/apps_search_box_controller.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/apps_search_results_controller.h
ocoa/apps_search_results_controller.mm
ocoa/apps_search_results_controller_unittest.mm
ocoa/apps_search_results_model_bridge.h
ocoa/apps_search_results_model_bridge.mm
ocoa/current_user_menu_item_view.h
ocoa/current_user_menu_item_view.mm
earch_box_model.cc
earch_box_model.h
earch_result.cc
earch_result.h
ignin_delegate.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_menu_views.cc
iews/contents_view.cc
iews/search_box_view.cc
iews/search_box_view.h
iews/search_result_view.cc
iews/search_result_view.h
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
pp_list_view_delegate.h
ocoa/test/apps_grid_controller_test_helper.mm
agination_model_unittest.cc
earch_box_model.h
earch_result.h
ignin_delegate.h
est/app_list_test_model.cc
iews/app_list_main_view.cc
iews/app_list_view.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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_search_box_controller.h
ocoa/apps_search_box_controller.mm
ocoa/apps_search_box_controller_unittest.mm
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
iews/app_list_background.cc
iews/app_list_drag_and_drop_host.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/cached_label.cc
iews/signin_view.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.gyp
pp_list_menu.cc
pp_list_menu.h
pp_list_switches.cc
pp_list_switches.h
pp_list_view_delegate.h
ocoa/app_list_pager_view.h
ocoa/app_list_pager_view.mm
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/app_list_window_controller.mm
ocoa/apps_collection_view_drag_manager.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.mm
ocoa/apps_pagination_model_observer.h
ocoa/scroll_view_with_no_scrollbars.mm
ocoa/test/apps_grid_controller_test_helper.mm
earch_result_list_view_delegate.h
est/app_list_test_view_delegate.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/search_result_list_view.cc
iews/search_result_view.h
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
WNERS
pp_list.gyp
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/app_list_window_controller.mm
ocoa/app_list_window_controller_unittest.mm
ocoa/apps_collection_view_drag_manager.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
earch_result.cc
earch_result.h
iews/app_list_drag_and_drop_host.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/search_result_view.cc
iews/search_result_view.h
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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_item_model.h
ocoa/app_list_pager_view.h
ocoa/app_list_pager_view.mm
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/apps_collection_view_drag_manager.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.mm
ocoa/apps_pagination_model_observer.h
iews/app_list_background.cc
iews/app_list_background.h
iews/app_list_drag_and_drop_host.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/contents_view.cc
iews/contents_view.h
iews/page_switcher.cc
iews/search_result_view.cc
iews/search_result_view.h
iews/signin_view.cc
iews/signin_view.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
pp_list.gyp
pp_list_constants.cc
pp_list_constants.h
pp_list_menu.cc
ocoa/app_list_view_controller.h
ocoa/app_list_window_controller.h
ocoa/apps_collection_view_drag_manager.h
ocoa/apps_collection_view_drag_manager.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
ocoa/item_drag_controller.h
ocoa/item_drag_controller.mm
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
agination_model.cc
agination_model_unittest.cc
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_suite.cc
est/app_list_test_suite.h
est/run_all_unittests.cc
iews/app_list_item_view.cc
iews/app_list_menu_views.cc
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_grid_view.cc
iews/apps_grid_view_unittest.cc
iews/contents_view.cc
iews/search_box_view.cc
iews/search_box_view.h
iews/search_result_list_view.cc
iews/search_result_view.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
EPS
WNERS
pp_list.gyp
pp_list_background.cc
pp_list_background.h
pp_list_constants.cc
pp_list_constants.h
pp_list_item_model.cc
pp_list_item_model.h
pp_list_item_model_observer.h
pp_list_item_view.cc
pp_list_item_view.h
pp_list_menu.cc
pp_list_menu.h
pp_list_view.cc
pp_list_view.h
pp_list_view_delegate.h
pps_grid_view.cc
pps_grid_view.h
pps_grid_view_unittest.cc
ocoa/app_list_view_controller.h
ocoa/app_list_view_controller.mm
ocoa/app_list_view_controller_unittest.mm
ocoa/app_list_window_controller.h
ocoa/app_list_window_controller.mm
ocoa/app_list_window_controller_unittest.mm
ocoa/apps_grid_controller.h
ocoa/apps_grid_controller.mm
ocoa/apps_grid_controller_unittest.mm
ocoa/apps_grid_view_item.h
ocoa/apps_grid_view_item.mm
ocoa/apps_pagination_model_observer.h
ocoa/scroll_view_with_no_scrollbars.h
ocoa/scroll_view_with_no_scrollbars.mm
ocoa/test/apps_grid_controller_test_helper.h
ocoa/test/apps_grid_controller_test_helper.mm
ontents_view.cc
ontents_view.h
age_switcher.cc
age_switcher.h
agination_model.cc
agination_model.h
agination_model_unittest.cc
ulsing_block_view.cc
ulsing_block_view.h
earch_box_view.cc
earch_box_view.h
earch_box_view_delegate.h
earch_result_list_view.cc
earch_result_list_view.h
earch_result_view.cc
earch_result_view.h
earch_result_view_delegate.h
ignin_delegate.cc
ignin_delegate.h
ignin_delegate_observer.h
est/app_list_test_model.cc
est/app_list_test_model.h
est/app_list_test_view_delegate.cc
est/app_list_test_view_delegate.h
est/apps_grid_view_test_api.cc
est/apps_grid_view_test_api.h
iews/DEPS
iews/app_list_background.cc
iews/app_list_background.h
iews/app_list_item_view.cc
iews/app_list_item_view.h
iews/app_list_main_view.cc
iews/app_list_main_view.h
iews/app_list_menu_views.cc
iews/app_list_menu_views.h
iews/app_list_view.cc
iews/app_list_view.h
iews/apps_grid_view.cc
iews/apps_grid_view.h
iews/apps_grid_view_unittest.cc
iews/cached_label.cc
iews/cached_label.h
iews/contents_view.cc
iews/contents_view.h
iews/page_switcher.cc
iews/page_switcher.h
iews/pulsing_block_view.cc
iews/pulsing_block_view.h
iews/search_box_view.cc
iews/search_box_view.h
iews/search_result_list_view.cc
iews/search_result_list_view.h
iews/search_result_view.cc
iews/search_result_view.h
iews/signin_view.cc
iews/signin_view.h
iews/test/apps_grid_view_test_api.cc
iews/test/apps_grid_view_test_api.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
WNERS
pp_list.gyp
pp_list_background.cc
pp_list_background.h
pp_list_constants.cc
pp_list_constants.h
pp_list_export.h
pp_list_item_model.cc
pp_list_item_model.h
pp_list_item_model_observer.h
pp_list_item_view.cc
pp_list_item_view.h
pp_list_model.cc
pp_list_model.h
pp_list_model_observer.h
pp_list_switches.cc
pp_list_switches.h
pp_list_view.cc
pp_list_view.h
pp_list_view_delegate.h
pps_grid_view.cc
pps_grid_view.h
pps_grid_view_delegate.h
pps_grid_view_unittest.cc
ontents_view.cc
ontents_view.h
age_switcher.cc
age_switcher.h
agination_model.cc
agination_model.h
agination_model_observer.h
agination_model_unittest.cc
ulsing_block_view.cc
ulsing_block_view.h
earch_box_model.cc
earch_box_model.h
earch_box_model_observer.h
earch_box_view.cc
earch_box_view.h
earch_box_view_delegate.h
earch_result.cc
earch_result.h
earch_result_list_view.cc
earch_result_list_view.h
earch_result_list_view_delegate.h
earch_result_observer.h
earch_result_view.cc
earch_result_view.h
earch_result_view_delegate.h
est/app_list_test_suite.cc
est/app_list_test_suite.h
est/apps_grid_view_test_api.cc
est/apps_grid_view_test_api.h
est/run_all_unittests.cc