• Home
  • History
  • Annotate
  • only in /external/chromium_org/athena/content/
History log of /external/chromium_org/athena/content/
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
EPS
pp_activity.cc
pp_activity.h
pp_activity_proxy.cc
pp_activity_proxy.h
pp_activity_registry.cc
pp_activity_registry.h
pp_activity_unittest.cc
pp_registry_impl.cc
hrome/DEPS
hrome/dialogs.cc
hrome/scheme_classifier_factory.cc
ontent_activity_factory.cc
ontent_activity_factory.h
ontent_app_model_builder.cc
ontent_proxy.cc
ontent_proxy.h
elegate/app_content_control_delegate_impl.cc
ublic/DEPS
ublic/app_content_control_delegate.h
ublic/app_registry.h
ublic/content_activity_factory.h
ublic/content_activity_factory_creator.h
ublic/content_app_model_builder.h
ublic/dialogs.h
ublic/scheme_classifier_factory.h
ender_view_context_menu_impl.cc
hell/dialogs.cc
hell/scheme_classifier_factory.cc
eb_activity.cc
eb_activity.h
eb_contents_view_delegate_factory_impl.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
WNERS
pp_activity.cc
pp_activity.h
pp_activity_proxy.cc
pp_activity_proxy.h
pp_activity_registry.cc
pp_activity_registry.h
pp_activity_unittest.cc
pp_registry_impl.cc
ontent_app_model_builder.cc
elegate/app_content_control_delegate_impl.cc
ublic/app_content_control_delegate.h
ublic/app_registry.h
eb_activity.cc
eb_activity.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
EPS
ontent_app_model_builder.cc
ublic/web_contents_view_delegate_creator.h
ender_view_context_menu_impl.cc
ender_view_context_menu_impl.h
eb_activity.cc
eb_activity.h
eb_contents_view_delegate_factory_impl.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
EPS
pp_activity.cc
pp_activity.h
ontent_activity_factory.cc
ontent_app_model_builder.cc
ublic/content_activity_factory.h
eb_activity.cc
eb_activity.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
EPS
pp_activity.cc
pp_activity.h
ontent_app_model_builder.cc
eb_activity.cc
eb_activity.h
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
EPS
ontent_app_model_builder.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
EPS
pp_activity.cc
pp_activity.h
ontent_activity_factory.cc
ontent_app_model_builder.cc
ublic/content_activity_factory.h
ublic/content_app_model_builder.h
eb_activity.cc
eb_activity.h
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
EPS
ontent_activity_factory.cc
ublic/DEPS
ublic/content_activity_factory.h
eb_activity.cc
eb_activity.h