OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/web_contents/navigation_controller_impl.h" | 5 #include "content/browser/web_contents/navigation_controller_impl.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 799 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
810 params.referrer, | 810 params.referrer, |
811 params.transition_type, | 811 params.transition_type, |
812 params.is_renderer_initiated, | 812 params.is_renderer_initiated, |
813 params.extra_headers, | 813 params.extra_headers, |
814 browser_context_)); | 814 browser_context_)); |
815 if (params.is_cross_site_redirect) | 815 if (params.is_cross_site_redirect) |
816 entry->set_should_replace_entry(true); | 816 entry->set_should_replace_entry(true); |
817 entry->SetIsOverridingUserAgent(override); | 817 entry->SetIsOverridingUserAgent(override); |
818 entry->set_transferred_global_request_id( | 818 entry->set_transferred_global_request_id( |
819 params.transferred_global_request_id); | 819 params.transferred_global_request_id); |
| 820 entry->SetFrameToNavigate(params.frame_name); |
820 | 821 |
821 switch (params.load_type) { | 822 switch (params.load_type) { |
822 case LOAD_TYPE_DEFAULT: | 823 case LOAD_TYPE_DEFAULT: |
823 break; | 824 break; |
824 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: | 825 case LOAD_TYPE_BROWSER_INITIATED_HTTP_POST: |
825 entry->SetHasPostData(true); | 826 entry->SetHasPostData(true); |
826 entry->SetBrowserInitiatedPostData( | 827 entry->SetBrowserInitiatedPostData( |
827 params.browser_initiated_post_data); | 828 params.browser_initiated_post_data); |
828 break; | 829 break; |
829 case LOAD_TYPE_DATA: | 830 case LOAD_TYPE_DATA: |
(...skipping 954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1784 const base::Callback<base::Time()>& get_timestamp_callback) { | 1785 const base::Callback<base::Time()>& get_timestamp_callback) { |
1785 get_timestamp_callback_ = get_timestamp_callback; | 1786 get_timestamp_callback_ = get_timestamp_callback; |
1786 } | 1787 } |
1787 | 1788 |
1788 void NavigationControllerImpl::SetTakeScreenshotCallbackForTest( | 1789 void NavigationControllerImpl::SetTakeScreenshotCallbackForTest( |
1789 const base::Callback<void(RenderViewHost*)>& take_screenshot_callback) { | 1790 const base::Callback<void(RenderViewHost*)>& take_screenshot_callback) { |
1790 take_screenshot_callback_ = take_screenshot_callback; | 1791 take_screenshot_callback_ = take_screenshot_callback; |
1791 } | 1792 } |
1792 | 1793 |
1793 } // namespace content | 1794 } // namespace content |
OLD | NEW |