| 29b820f8d84e3bc97d62552e54923c42407f2f29 |
12-Nov-2014 |
Ben Murdoch <benm@google.com> |
Merge from Chromium at DEPS revision 39.0.2171.59
This commit was generated by merge_to_master.py.
Change-Id: If9c0c09d8c3a3121b5e75ae9c4c446e4e4baaae6
trings/translations/athena_strings_am.xtb
trings/translations/athena_strings_ar.xtb
trings/translations/athena_strings_bg.xtb
trings/translations/athena_strings_bn.xtb
trings/translations/athena_strings_ca.xtb
trings/translations/athena_strings_cs.xtb
trings/translations/athena_strings_da.xtb
trings/translations/athena_strings_de.xtb
trings/translations/athena_strings_el.xtb
trings/translations/athena_strings_en-GB.xtb
trings/translations/athena_strings_es-419.xtb
trings/translations/athena_strings_es.xtb
trings/translations/athena_strings_et.xtb
trings/translations/athena_strings_fa.xtb
trings/translations/athena_strings_fi.xtb
trings/translations/athena_strings_fil.xtb
trings/translations/athena_strings_fr.xtb
trings/translations/athena_strings_gu.xtb
trings/translations/athena_strings_hi.xtb
trings/translations/athena_strings_hr.xtb
trings/translations/athena_strings_hu.xtb
trings/translations/athena_strings_id.xtb
trings/translations/athena_strings_it.xtb
trings/translations/athena_strings_iw.xtb
trings/translations/athena_strings_ja.xtb
trings/translations/athena_strings_kn.xtb
trings/translations/athena_strings_ko.xtb
trings/translations/athena_strings_lt.xtb
trings/translations/athena_strings_lv.xtb
trings/translations/athena_strings_ml.xtb
trings/translations/athena_strings_mr.xtb
trings/translations/athena_strings_ms.xtb
trings/translations/athena_strings_nl.xtb
trings/translations/athena_strings_no.xtb
trings/translations/athena_strings_pl.xtb
trings/translations/athena_strings_pt-BR.xtb
trings/translations/athena_strings_pt-PT.xtb
trings/translations/athena_strings_ro.xtb
trings/translations/athena_strings_ru.xtb
trings/translations/athena_strings_sk.xtb
trings/translations/athena_strings_sl.xtb
trings/translations/athena_strings_sr.xtb
trings/translations/athena_strings_sv.xtb
trings/translations/athena_strings_sw.xtb
trings/translations/athena_strings_ta.xtb
trings/translations/athena_strings_te.xtb
trings/translations/athena_strings_th.xtb
trings/translations/athena_strings_tr.xtb
trings/translations/athena_strings_uk.xtb
trings/translations/athena_strings_vi.xtb
trings/translations/athena_strings_zh-CN.xtb
trings/translations/athena_strings_zh-TW.xtb
|
| 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
EPS
ctivity/DEPS
ctivity/activity.cc
ctivity/activity_frame_view.cc
ctivity/activity_frame_view.h
ctivity/activity_manager_impl.cc
ctivity/activity_manager_impl.h
ctivity/activity_manager_unittest.cc
ctivity/activity_view_manager_impl.cc
ctivity/public/activity.h
ctivity/public/activity_factory.h
ctivity/public/activity_manager.h
ctivity/public/activity_manager_observer.h
ctivity/public/activity_view_manager.h
ctivity/public/activity_view_model.h
thena.gyp
ommon/DEPS
ommon/container_priorities.h
ommon/fill_layout_manager.cc
ommon/fill_layout_manager.h
ommon/fill_layout_manager_unittest.cc
ommon/switches.cc
ommon/switches.h
ontent/DEPS
ontent/app_activity.cc
ontent/app_activity.h
ontent/app_activity_proxy.cc
ontent/app_activity_proxy.h
ontent/app_activity_registry.cc
ontent/app_activity_registry.h
ontent/app_activity_unittest.cc
ontent/app_registry_impl.cc
ontent/chrome/DEPS
ontent/chrome/dialogs.cc
ontent/chrome/scheme_classifier_factory.cc
ontent/content_activity_factory.cc
ontent/content_activity_factory.h
ontent/content_app_model_builder.cc
ontent/content_proxy.cc
ontent/content_proxy.h
ontent/delegate/app_content_control_delegate_impl.cc
ontent/public/DEPS
ontent/public/app_content_control_delegate.h
ontent/public/app_registry.h
ontent/public/content_activity_factory.h
ontent/public/content_activity_factory_creator.h
ontent/public/content_app_model_builder.h
ontent/public/dialogs.h
ontent/public/scheme_classifier_factory.h
ontent/render_view_context_menu_impl.cc
ontent/shell/dialogs.cc
ontent/shell/scheme_classifier_factory.cc
ontent/web_activity.cc
ontent/web_activity.h
ontent/web_contents_view_delegate_factory_impl.cc
nv/DEPS
nv/athena_env_impl.cc
nv/athena_env_unittest.cc
nv/public/DEPS
nv/public/athena_env.h
xtensions/DEPS
xtensions/athena_app_delegate_base.cc
xtensions/athena_app_delegate_base.h
xtensions/athena_app_window_client_base.cc
xtensions/athena_app_window_client_base.h
xtensions/athena_native_app_window_views.cc
xtensions/athena_native_app_window_views.h
xtensions/chrome/DEPS
xtensions/chrome/athena_chrome_app_delegate.cc
xtensions/chrome/athena_chrome_app_delegate.h
xtensions/chrome/athena_chrome_app_window_client.cc
xtensions/chrome/athena_chrome_app_window_client.h
xtensions/chrome/extensions_delegate_impl.cc
xtensions/extension_app_model_builder.cc
xtensions/extensions_delegate.cc
xtensions/extensions_delegate_impl.cc
xtensions/public/extension_app_model_builder.h
xtensions/public/extensions_delegate.h
xtensions/shell/DEPS
xtensions/shell/athena_shell_app_delegate.cc
xtensions/shell/athena_shell_app_delegate.h
xtensions/shell/athena_shell_app_window_client.cc
xtensions/shell/athena_shell_app_window_client.h
xtensions/shell/extensions_delegate_impl.cc
xtensions/test/test_extensions_delegate.cc
ome/DEPS
ome/app_list_view_delegate.cc
ome/athena_start_page_view.cc
ome/athena_start_page_view.h
ome/athena_start_page_view_unittest.cc
ome/home_card_constants.cc
ome/home_card_constants.h
ome/home_card_gesture_manager.cc
ome/home_card_gesture_manager.h
ome/home_card_gesture_manager_unittest.cc
ome/home_card_impl.cc
ome/home_card_impl.h
ome/home_card_unittest.cc
ome/minimized_home.cc
ome/minimized_home.h
nput/accelerator_manager_impl.cc
ain/DEPS
ain/athena_app_window_controller.cc
ain/athena_app_window_controller.h
ain/athena_content_client.cc
ain/athena_content_client.h
ain/athena_frame_view.cc
ain/athena_frame_view.h
ain/athena_launcher.cc
ain/athena_launcher.h
ain/athena_main.cc
ain/athena_main.gyp
ain/athena_renderer_pdf_helper.cc
ain/athena_renderer_pdf_helper.h
ain/athena_views_delegate.cc
ain/athena_views_delegate.h
ain/debug/DEPS
ain/debug/debug_window.cc
ain/debug/debug_window.h
ain/debug/network_selector.cc
ain/debug/network_selector.h
ain/placeholder.cc
ain/public/athena_launcher.h
ain/url_search_provider.cc
ain/url_search_provider.h
esource_manager/DEPS
esource_manager/OWNERS
esource_manager/delegate/resource_manager_delegate.cc
esource_manager/memory_pressure_notifier.cc
esource_manager/memory_pressure_notifier.h
esource_manager/memory_pressure_notifier_unittest.cc
esource_manager/public/DEPS
esource_manager/public/resource_manager.h
esource_manager/public/resource_manager_delegate.h
esource_manager/resource_manager_impl.cc
esource_manager/resource_manager_unittest.cc
esources/DEPS
esources/athena_resources.gyp
esources/athena_resources.h
creen/DEPS
creen/background_controller.cc
creen/background_controller.h
creen/public/screen_manager.h
creen/public/screen_manager_delegate.h
creen/screen_manager_impl.cc
creen/screen_manager_unittest.cc
trings/athena_strings.grd
trings/athena_strings.gyp
ystem/DEPS
ystem/background_controller.cc
ystem/background_controller.h
ystem/device_socket_listener.cc
ystem/device_socket_listener.h
ystem/network_selector.cc
ystem/network_selector.h
ystem/orientation_controller.cc
ystem/orientation_controller.h
ystem/power_button_controller.cc
ystem/power_button_controller.h
ystem/public/system_ui.h
ystem/status_icon_container_view.cc
ystem/status_icon_container_view.h
ystem/system_ui_impl.cc
ystem/time_view.cc
ystem/time_view.h
est/DEPS
est/athena_test_base.cc
est/athena_test_base.h
est/athena_test_helper.cc
est/athena_test_helper.h
est/sample_activity.cc
est/sample_activity.h
est/sample_activity_factory.cc
est/sample_activity_factory.h
est/test_app_content_control_delegate_impl.cc
est/test_resource_manager_delegate.cc
est/test_screen_manager_delegate.cc
est/test_screen_manager_delegate.h
til/DEPS
til/container_priorities.h
til/drag_handle.cc
til/drag_handle.h
til/drag_handle_unittest.cc
til/fill_layout_manager.cc
til/fill_layout_manager.h
til/fill_layout_manager_unittest.cc
til/switches.cc
til/switches.h
irtual_keyboard/public/virtual_keyboard_manager.h
irtual_keyboard/virtual_keyboard_manager_impl.cc
m/DEPS
m/bezel_controller.cc
m/bezel_controller.h
m/overview_toolbar.cc
m/overview_toolbar.h
m/public/window_list_provider.h
m/public/window_list_provider_observer.h
m/public/window_manager.h
m/public/window_manager_observer.h
m/split_view_controller.cc
m/split_view_controller.h
m/split_view_controller_unittest.cc
m/test/window_manager_impl_test_api.cc
m/test/window_manager_impl_test_api.h
m/window_list_provider_impl.cc
m/window_list_provider_impl.h
m/window_list_provider_impl_unittest.cc
m/window_manager_impl.cc
m/window_manager_impl.h
m/window_manager_unittest.cc
m/window_overview_mode.cc
m/window_overview_mode.h
|
| 03b57e008b61dfcb1fbad3aea950ae0e001748b0 |
28-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 291560
This commit was generated by merge_to_master.py.
Change-Id: Ic58269055810d51286b4109e59b90b6856887a30
ctivity/public/activity.h
thena.gyp
ommon/fill_layout_manager_unittest.cc
ontent/DEPS
ontent/OWNERS
ontent/app_activity.cc
ontent/app_activity.h
ontent/app_activity_proxy.cc
ontent/app_activity_proxy.h
ontent/app_activity_registry.cc
ontent/app_activity_registry.h
ontent/app_activity_unittest.cc
ontent/app_registry_impl.cc
ontent/content_app_model_builder.cc
ontent/delegate/app_content_control_delegate_impl.cc
ontent/public/app_content_control_delegate.h
ontent/public/app_registry.h
ontent/web_activity.cc
ontent/web_activity.h
xtensions/DEPS
xtensions/extensions_delegate_impl.cc
xtensions/public/DEPS
xtensions/public/extensions_delegate.h
xtensions/test/test_extensions_delegate.cc
ome/athena_start_page_view.cc
ome/athena_start_page_view.h
ome/home_card_impl.cc
ome/home_card_unittest.cc
ain/DEPS
ain/athena_app_window_controller.cc
ain/athena_app_window_controller.h
ain/athena_launcher.cc
ain/athena_launcher.h
ain/athena_main.cc
ain/athena_main.gyp
ain/athena_shell.cc
ain/debug/debug_window.cc
esources/athena_resources.gyp
creen/public/screen_manager.h
creen/public/screen_manager_delegate.h
creen/screen_manager_impl.cc
creen/screen_manager_unittest.cc
ystem/device_socket_listener.cc
ystem/device_socket_listener.h
ystem/orientation_controller.cc
ystem/orientation_controller.h
ystem/system_ui_impl.cc
est/DEPS
est/athena_test_base.cc
est/athena_test_base.h
est/athena_test_helper.cc
est/athena_test_helper.h
est/sample_activity.cc
est/sample_activity.h
est/test_app_content_control_delegate_impl.cc
est/test_screen_manager_delegate.cc
est/test_screen_manager_delegate.h
m/split_view_controller.cc
m/split_view_controller.h
m/split_view_controller_unittest.cc
m/test/window_manager_impl_test_api.cc
m/test/window_manager_impl_test_api.h
m/window_manager_impl.cc
m/window_manager_impl.h
m/window_manager_unittest.cc
m/window_overview_mode.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
ctivity/DEPS
ctivity/activity_frame_view.cc
ctivity/activity_view_manager_impl.cc
thena.gyp
ommon/DEPS
ontent/DEPS
ontent/content_app_model_builder.cc
ontent/public/web_contents_view_delegate_creator.h
ontent/render_view_context_menu_impl.cc
ontent/render_view_context_menu_impl.h
ontent/web_activity.cc
ontent/web_activity.h
ontent/web_contents_view_delegate_factory_impl.cc
ome/DEPS
ome/app_list_view_delegate.cc
ome/app_list_view_delegate.h
ome/athena_start_page_view.cc
ome/athena_start_page_view.h
ome/bottom_home_view.cc
ome/bottom_home_view.h
ome/home_card_impl.cc
ome/minimized_home.cc
ome/minimized_home.h
ain/athena_launcher.cc
ain/athena_main.cc
esources/athena_resources.grd
esources/athena_resources.gyp
esources/default_100_percent/overview_split.png
esources/default_100_percent/overview_trash.png
creen/DEPS
creen/background_controller.cc
creen/public/screen_manager.h
creen/screen_accelerator_handler.cc
creen/screen_manager_impl.cc
ystem/DEPS
ystem/device_socket_listener.cc
ystem/device_socket_listener.h
ystem/orientation_controller.cc
ystem/orientation_controller.h
ystem/power_button_controller.cc
ystem/power_button_controller.h
ystem/public/system_ui.h
ystem/system_ui_impl.cc
est/athena_test_base.cc
m/DEPS
m/bezel_controller.cc
m/bezel_controller.h
m/overview_toolbar.cc
m/overview_toolbar.h
m/public/window_list_provider.h
m/public/window_manager.h
m/public/window_manager_observer.h
m/split_view_controller.cc
m/split_view_controller.h
m/split_view_controller_unittest.cc
m/title_drag_controller.cc
m/title_drag_controller.h
m/window_list_provider_impl.cc
m/window_list_provider_impl.h
m/window_list_provider_impl_unittest.cc
m/window_manager_impl.cc
m/window_overview_mode.cc
m/window_overview_mode.h
|
| 5f1c94371a64b3196d4be9466099bb892df9b88e |
12-Aug-2014 |
Torne (Richard Coles) <torne@google.com> |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
ctivity/activity_frame_view.cc
ctivity/activity_view_manager_impl.cc
ctivity/public/activity_factory.h
thena.gyp
ommon/container_priorities.h
ontent/DEPS
ontent/app_activity.cc
ontent/app_activity.h
ontent/content_activity_factory.cc
ontent/content_app_model_builder.cc
ontent/public/content_activity_factory.h
ontent/web_activity.cc
ontent/web_activity.h
ome/DEPS
ome/app_list_view_delegate.cc
ome/bottom_home_view.cc
ome/bottom_home_view.h
ome/home_card_impl.cc
ome/home_card_unittest.cc
ome/minimized_home.cc
ome/minimized_home.h
ome/public/home_card.h
nput/accelerator_manager_unittest.cc
ain/DEPS
ain/athena_app_window_controller.cc
ain/athena_app_window_controller.h
ain/athena_launcher.cc
ain/athena_main.cc
ain/athena_main.gyp
ain/athena_shell.cc
ain/debug/DEPS
ain/debug/debug_window.cc
ain/debug/network_selector.cc
ain/debug/network_selector.h
ain/placeholder.cc
ain/url_search_provider.cc
ain/url_search_provider.h
esources/athena_resources.grd
esources/athena_resources.gyp
esources/default_100_percent/background_wallpaper.png
esources/default_200_percent/background_wallpaper.png
creen/DEPS
creen/public/screen_manager.h
creen/screen_manager_impl.cc
creen/screen_manager_unittest.cc
ystem/DEPS
ystem/power_button_controller.cc
ystem/power_button_controller.h
ystem/public/DEPS
ystem/public/system_ui.h
ystem/system_ui_impl.cc
est/DEPS
est/athena_test_helper.cc
est/athena_unittests.cc
est/sample_activity_factory.cc
est/sample_activity_factory.h
irtual_keyboard/DEPS
irtual_keyboard/public/virtual_keyboard_bindings.h
irtual_keyboard/virtual_keyboard_bindings_impl.cc
irtual_keyboard/virtual_keyboard_manager_impl.cc
irtual_keyboard/vk_message_handler.cc
irtual_keyboard/vk_message_handler.h
irtual_keyboard/vk_webui_controller.cc
irtual_keyboard/vk_webui_controller.h
m/bezel_controller.cc
m/bezel_controller.h
m/split_view_controller.cc
m/split_view_controller.h
m/window_manager_impl.cc
m/window_overview_mode.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
ctivity/activity_frame_view.cc
ctivity/activity_frame_view.h
ctivity/activity_view_manager_impl.cc
ctivity/activity_widget_delegate.cc
ctivity/activity_widget_delegate.h
ctivity/public/activity.h
ctivity/public/activity_view_model.h
thena.gyp
ontent/DEPS
ontent/app_activity.cc
ontent/app_activity.h
ontent/content_app_model_builder.cc
ontent/web_activity.cc
ontent/web_activity.h
ome/DEPS
ome/app_list_view_delegate.cc
ome/app_list_view_delegate.h
ome/home_card_impl.cc
ome/minimized_home.cc
ome/minimized_home.h
ome/public/home_card.h
ain/DEPS
ain/athena_main.cc
ain/athena_main.gyp
ain/debug/DEPS
ain/debug/debug_window.cc
ain/debug/debug_window.h
ain/url_search_provider.cc
ain/url_search_provider.h
esources/DEPS
esources/athena_resources.gyp
esources/athena_resources.h
creen/public/screen_manager.h
creen/screen_manager_impl.cc
est/sample_activity.cc
est/sample_activity.h
est/test_app_model_builder.cc
irtual_keyboard/virtual_keyboard_manager_impl.cc
m/DEPS
m/public/window_manager.h
m/public/window_manager_observer.h
m/window_manager_impl.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
thena.gyp
ommon/DEPS
ommon/fill_layout_manager.cc
ommon/fill_layout_manager.h
ontent/DEPS
ontent/content_app_model_builder.cc
ain/DEPS
ain/athena_main.cc
ain/athena_main.gyp
creen/screen_manager_impl.cc
est/athena_test_helper.cc
irtual_keyboard/DEPS
irtual_keyboard/public/DEPS
irtual_keyboard/public/virtual_keyboard_bindings.h
irtual_keyboard/public/virtual_keyboard_manager.h
irtual_keyboard/virtual_keyboard_bindings_impl.cc
irtual_keyboard/virtual_keyboard_manager_impl.cc
irtual_keyboard/vk_message_handler.cc
irtual_keyboard/vk_message_handler.h
irtual_keyboard/vk_webui_controller.cc
irtual_keyboard/vk_webui_controller.h
|
| 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
EPS
ctivity/DEPS
ctivity/activity_view_manager_impl.cc
ctivity/public/activity_factory.h
ctivity/public/activity_view_model.h
thena.gyp
ommon/switches.cc
ommon/switches.h
ontent/DEPS
ontent/app_activity.cc
ontent/app_activity.h
ontent/content_activity_factory.cc
ontent/content_app_model_builder.cc
ontent/public/content_activity_factory.h
ontent/public/content_app_model_builder.h
ontent/web_activity.cc
ontent/web_activity.h
ome/app_list_view_delegate.cc
ome/app_list_view_delegate.h
ome/home_card_impl.cc
ome/public/app_model_builder.h
ome/public/home_card.h
nput/DEPS
nput/accelerator_manager_impl.cc
nput/accelerator_manager_impl.h
nput/accelerator_manager_unittest.cc
nput/input_manager_impl.cc
nput/public/accelerator_manager.h
ain/DEPS
ain/athena_app_window_controller.cc
ain/athena_app_window_controller.h
ain/athena_launcher.cc
ain/athena_launcher.h
ain/athena_main.cc
ain/athena_main.gyp
ain/url_search_provider.cc
ain/url_search_provider.h
creen/DEPS
creen/background_controller.cc
creen/screen_accelerator_handler.cc
creen/screen_accelerator_handler.h
creen/screen_manager_impl.cc
est/DEPS
est/athena_test_base.cc
est/athena_test_helper.cc
est/sample_activity.cc
est/sample_activity.h
est/sample_activity_factory.cc
est/sample_activity_factory.h
est/test_app_model_builder.cc
est/test_app_model_builder.h
m/DEPS
m/window_manager_impl.cc
m/window_overview_mode.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
ctivity/DEPS
ctivity/activity.cc
ctivity/activity_factory.cc
ctivity/activity_manager_impl.cc
ctivity/activity_manager_unittest.cc
ctivity/activity_view_manager_impl.cc
ctivity/public/DEPS
ctivity/public/activity.h
ctivity/public/activity_factory.h
ctivity/public/activity_manager.h
ctivity/public/activity_view_manager.h
ctivity/public/activity_view_model.h
thena.gyp
ontent/DEPS
ontent/content_activity_factory.cc
ontent/public/DEPS
ontent/public/content_activity_factory.h
ontent/web_activity.cc
ontent/web_activity.h
ome/DEPS
ome/app_list_view_delegate.cc
ome/app_list_view_delegate.h
ome/home_card_delegate_view.cc
ome/home_card_delegate_view.h
ome/home_card_impl.cc
nput/DEPS
nput/accelerator_manager_impl.cc
nput/accelerator_manager_impl.h
nput/accelerator_manager_unittest.cc
nput/input_manager_impl.cc
nput/public/DEPS
nput/public/accelerator_manager.h
nput/public/input_manager.h
ain/DEPS
ain/athena_launcher.cc
ain/athena_launcher.h
ain/athena_main.cc
ain/athena_main.gyp
ain/athena_shell.cc
ain/placeholder.cc
ain/placeholder.h
est/DEPS
est/athena_test_helper.cc
est/sample_activity.cc
est/sample_activity.h
est/sample_activity_factory.cc
est/sample_activity_factory.h
m/DEPS
m/public/window_manager.h
m/window_manager_impl.cc
m/window_overview_mode.cc
m/window_overview_mode.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
EPS
thena.gyp
thena_export.h
ome/DEPS
ome/home_card_delegate_view.cc
ome/home_card_delegate_view.h
ome/home_card_impl.cc
ome/public/DEPS
ome/public/home_card.h
ain/DEPS
ain/athena_launcher.cc
ain/athena_launcher.h
ain/athena_main.cc
ain/athena_main.gyp
ain/athena_shell.cc
ain/placeholder.cc
ain/placeholder.h
creen/DEPS
creen/background_controller.cc
creen/background_controller.h
creen/public/DEPS
creen/public/screen_manager.h
creen/screen_manager_impl.cc
est/DEPS
est/athena_test_base.cc
est/athena_test_base.h
est/athena_test_helper.cc
est/athena_test_helper.h
est/athena_unittests.cc
m/DEPS
m/public/DEPS
m/public/window_manager.h
m/window_manager_impl.cc
m/window_manager_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
EPS
WNERS
|