OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 2903 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2914 document_state->set_was_npn_negotiated( | 2914 document_state->set_was_npn_negotiated( |
2915 extra_data->was_npn_negotiated()); | 2915 extra_data->was_npn_negotiated()); |
2916 document_state->set_npn_negotiated_protocol( | 2916 document_state->set_npn_negotiated_protocol( |
2917 extra_data->npn_negotiated_protocol()); | 2917 extra_data->npn_negotiated_protocol()); |
2918 document_state->set_was_alternate_protocol_available( | 2918 document_state->set_was_alternate_protocol_available( |
2919 extra_data->was_alternate_protocol_available()); | 2919 extra_data->was_alternate_protocol_available()); |
2920 document_state->set_connection_info( | 2920 document_state->set_connection_info( |
2921 extra_data->connection_info()); | 2921 extra_data->connection_info()); |
2922 document_state->set_was_fetched_via_proxy( | 2922 document_state->set_was_fetched_via_proxy( |
2923 extra_data->was_fetched_via_proxy()); | 2923 extra_data->was_fetched_via_proxy()); |
| 2924 document_state->set_proxy_server( |
| 2925 extra_data->proxy_server()); |
2924 } | 2926 } |
2925 InternalDocumentStateData* internal_data = | 2927 InternalDocumentStateData* internal_data = |
2926 InternalDocumentStateData::FromDocumentState(document_state); | 2928 InternalDocumentStateData::FromDocumentState(document_state); |
2927 internal_data->set_http_status_code(http_status_code); | 2929 internal_data->set_http_status_code(http_status_code); |
2928 // Whether or not the http status code actually corresponds to an error is | 2930 // Whether or not the http status code actually corresponds to an error is |
2929 // only checked when the page is done loading, if |use_error_page| is | 2931 // only checked when the page is done loading, if |use_error_page| is |
2930 // still true. | 2932 // still true. |
2931 internal_data->set_use_error_page(true); | 2933 internal_data->set_use_error_page(true); |
2932 } | 2934 } |
2933 | 2935 |
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4115 | 4117 |
4116 #if defined(ENABLE_BROWSER_CDMS) | 4118 #if defined(ENABLE_BROWSER_CDMS) |
4117 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4119 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
4118 if (!cdm_manager_) | 4120 if (!cdm_manager_) |
4119 cdm_manager_ = new RendererCdmManager(this); | 4121 cdm_manager_ = new RendererCdmManager(this); |
4120 return cdm_manager_; | 4122 return cdm_manager_; |
4121 } | 4123 } |
4122 #endif // defined(ENABLE_BROWSER_CDMS) | 4124 #endif // defined(ENABLE_BROWSER_CDMS) |
4123 | 4125 |
4124 } // namespace content | 4126 } // namespace content |
OLD | NEW |