• Home
  • History
  • Annotate
  • only in /external/chromium_org/content/browser/frame_host/
History log of /external/chromium_org/content/browser/frame_host/
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
cebcd4cfff375dbdae8cf55d6148cf3dddd127d1 26-Jan-2015 ningxin.hu <ningxin.hu@intel.com> Cherrypick "Allow universal access from file if flag is set and url is file scheme."

Fixes a crash when WebView apps which have enabled
WebSettings.setAllowUniversalFileAccessFromFiles(true) try to call JS
history functions with URLs that are from a non-file:// origin, which is
used by some Cordova apps.

> BUG=449075
> TEST=content_unittests --gtest_filter=NavigationControllerTest.IsInPageNavigation
>
> Review URL: https://codereview.chromium.org/855883002
>
> Cr-Commit-Position: refs/heads/master@{#313051}

Bug: 19173646
avigation_controller_impl.cc
avigation_controller_impl_unittest.cc
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
ender_frame_host_impl.cc
ender_frame_host_impl.h
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
rame_tree.cc
rame_tree.h
rame_tree_node.cc
rame_tree_node.h
rame_tree_unittest.cc
ender_frame_host_impl.cc
ender_frame_host_manager_unittest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.h
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
ross_process_frame_connector.cc
ross_process_frame_connector.h
ebug_urls.cc
ebug_urls.h
rame_accessibility.cc
rame_accessibility.h
rame_tree.cc
rame_tree_browsertest.cc
rame_tree_node.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_before_commit_info.cc
avigation_before_commit_info.h
avigation_controller_android.cc
avigation_controller_android.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigation_entry_impl_unittest.cc
avigation_entry_screenshot_manager.cc
avigation_entry_screenshot_manager.h
avigation_request.cc
avigation_request.h
avigation_request_info.cc
avigation_request_info.h
avigator.h
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
opup_menu_helper_mac.h
opup_menu_helper_mac.mm
ender_frame_host_delegate.cc
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_frame_proxy_host.cc
ender_frame_proxy_host.h
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.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
ross_site_transferring_request.h
avigation_before_commit_info.h
avigation_controller_impl_unittest.cc
avigation_request.h
avigator.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_frame_proxy_host.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.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
ebug_urls.cc
rame_tree.cc
rame_tree.h
rame_tree_browsertest.cc
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_delegate.h
avigation_controller_impl.cc
avigation_controller_impl_unittest.cc
avigation_entry_screenshot_manager.cc
avigator_impl.cc
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_unittest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_guest.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
ebug_urls.cc
ebug_urls.h
rame_tree.cc
rame_tree.h
rame_tree_browsertest.cc
avigation_controller_impl.cc
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigator.h
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_frame_proxy_host.cc
ender_frame_proxy_host.h
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.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
rame_tree.cc
rame_tree.h
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_android.cc
avigation_controller_android.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigation_entry_screenshot_manager.cc
avigation_request.cc
avigation_request.h
avigation_request_info.cc
avigation_request_info.h
avigator.h
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_delegate.cc
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_unittest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.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
ross_process_frame_connector.cc
ross_process_frame_connector.h
ender_frame_host_impl.cc
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_proxy_host.cc
ender_frame_proxy_host.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
ebug_urls.cc
avigation_controller_impl_unittest.cc
avigator_impl.cc
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager_browsertest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.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
avigation_controller_delegate.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_screenshot_manager.cc
avigator_delegate.cc
avigator_delegate.h
avigator_impl.cc
ender_widget_host_view_guest.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
ross_process_frame_connector.cc
ross_process_frame_connector.h
ebug_urls.cc
ebug_urls.h
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_impl.cc
avigation_controller_impl_unittest.cc
avigator_impl.cc
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_frame_message_filter.cc
ender_frame_message_filter.h
ender_frame_proxy_host.cc
ender_frame_proxy_host.h
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.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
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_impl.cc
avigator.h
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_unittest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.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
nterstitial_page_impl.cc
nterstitial_page_impl.h
nterstitial_page_navigator_impl.cc
nterstitial_page_navigator_impl.h
avigation_controller_delegate.h
avigation_controller_impl.cc
avigation_controller_impl_unittest.cc
avigator.cc
avigator.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_unittest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.h
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
rame_tree_node.cc
rame_tree_unittest.cc
nterstitial_page_impl.cc
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_browsertest.cc
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigator_delegate.cc
avigator_delegate.h
avigator_impl.cc
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
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
avigation_controller_delegate.h
avigation_controller_impl.cc
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_unittest.cc
ender_frame_proxy_host.cc
ender_frame_proxy_host.h
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.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
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_screenshot_manager.cc
ender_frame_host_delegate.cc
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager_unittest.cc
ender_widget_host_view_guest.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
avigator_delegate.h
avigator_impl.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
rame_tree_browsertest.cc
nterstitial_page_impl.cc
avigation_controller_delegate.h
avigation_controller_impl_unittest.cc
avigator.h
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_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
avigator_impl.cc
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_widget_host_view_guest.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
ross_process_frame_connector.cc
ross_process_frame_connector.h
ross_site_transferring_request.cc
ross_site_transferring_request.h
rame_tree.cc
rame_tree.h
rame_tree_browsertest.cc
rame_tree_node.cc
rame_tree_node.h
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_screenshot_manager.cc
avigator.cc
avigator.h
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_frame_message_filter.cc
ender_frame_message_filter.h
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_child_frame_unittest.cc
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.h
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
ross_process_frame_connector.cc
ross_process_frame_connector.h
ebug_urls.cc
ebug_urls.h
rame_tree.cc
rame_tree.h
rame_tree_browsertest.cc
rame_tree_node.cc
rame_tree_node.h
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
nterstitial_page_navigator_impl.cc
nterstitial_page_navigator_impl.h
avigation_controller_delegate.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigation_entry_impl_unittest.cc
avigation_entry_screenshot_manager.cc
avigator.cc
avigator.h
avigator_delegate.cc
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_delegate.cc
ender_frame_host_delegate.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_frame_message_filter.cc
ender_widget_host_view_child_frame.cc
ender_widget_host_view_child_frame.h
ender_widget_host_view_child_frame_unittest.cc
ender_widget_host_view_guest.cc
ender_widget_host_view_guest.h
ender_widget_host_view_guest_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
WNERS
rame_tree.cc
rame_tree.h
rame_tree_node.cc
rame_tree_node.h
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
nterstitial_page_navigator_impl.cc
nterstitial_page_navigator_impl.h
avigation_controller_android.cc
avigation_controller_android.h
avigation_controller_impl.cc
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigation_entry_impl_unittest.cc
avigator.cc
avigator.h
avigator_delegate.h
avigator_impl.cc
avigator_impl.h
ender_frame_host_delegate.cc
ender_frame_host_delegate.h
ender_frame_host_factory.cc
ender_frame_host_factory.h
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_unittest.cc
est_render_frame_host.cc
est_render_frame_host.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
EPS
rame_tree.cc
rame_tree.h
rame_tree_node.cc
rame_tree_node.h
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigation_entry_impl_unittest.cc
avigation_entry_screenshot_manager.cc
avigation_entry_screenshot_manager.h
avigator.cc
avigator.h
avigator_delegate.h
ender_frame_host_factory.cc
ender_frame_host_factory.h
ender_frame_host_impl.h
ender_frame_host_manager.cc
ender_frame_host_manager.h
ender_frame_host_manager_browsertest.cc
ender_frame_host_manager_unittest.cc
ender_view_host_manager.cc
ender_view_host_manager.h
ender_view_host_manager_unittest.cc
est_render_frame_host.cc
est_render_frame_host.h
eb_contents_screenshot_manager.cc
eb_contents_screenshot_manager.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
EPS
ebug_urls.cc
ebug_urls.h
rame_tree.cc
rame_tree.h
rame_tree_node.cc
rame_tree_node.h
rame_tree_unittest.cc
nterstitial_page_impl.cc
nterstitial_page_impl.h
avigation_controller_delegate.h
avigation_controller_impl.cc
avigation_controller_impl.h
avigation_controller_impl_unittest.cc
avigation_entry_impl.cc
avigation_entry_impl.h
avigation_entry_impl_unittest.cc
ender_frame_host_impl.cc
ender_frame_host_impl.h
ender_frame_message_filter.cc
ender_frame_message_filter.h
ender_view_host_manager.cc
ender_view_host_manager.h
ender_view_host_manager_unittest.cc
eb_contents_screenshot_manager.cc
eb_contents_screenshot_manager.h