Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(579)

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 686313002: Make the proxy server HostPortPair available in document_state so that (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 2914 matching lines...) Expand 10 before | Expand all | Expand 10 after
2925 document_state->set_was_npn_negotiated( 2925 document_state->set_was_npn_negotiated(
2926 extra_data->was_npn_negotiated()); 2926 extra_data->was_npn_negotiated());
2927 document_state->set_npn_negotiated_protocol( 2927 document_state->set_npn_negotiated_protocol(
2928 extra_data->npn_negotiated_protocol()); 2928 extra_data->npn_negotiated_protocol());
2929 document_state->set_was_alternate_protocol_available( 2929 document_state->set_was_alternate_protocol_available(
2930 extra_data->was_alternate_protocol_available()); 2930 extra_data->was_alternate_protocol_available());
2931 document_state->set_connection_info( 2931 document_state->set_connection_info(
2932 extra_data->connection_info()); 2932 extra_data->connection_info());
2933 document_state->set_was_fetched_via_proxy( 2933 document_state->set_was_fetched_via_proxy(
2934 extra_data->was_fetched_via_proxy()); 2934 extra_data->was_fetched_via_proxy());
2935 document_state->set_proxy_server(
2936 extra_data->proxy_server());
2935 } 2937 }
2936 InternalDocumentStateData* internal_data = 2938 InternalDocumentStateData* internal_data =
2937 InternalDocumentStateData::FromDocumentState(document_state); 2939 InternalDocumentStateData::FromDocumentState(document_state);
2938 internal_data->set_http_status_code(http_status_code); 2940 internal_data->set_http_status_code(http_status_code);
2939 // Whether or not the http status code actually corresponds to an error is 2941 // Whether or not the http status code actually corresponds to an error is
2940 // only checked when the page is done loading, if |use_error_page| is 2942 // only checked when the page is done loading, if |use_error_page| is
2941 // still true. 2943 // still true.
2942 internal_data->set_use_error_page(true); 2944 internal_data->set_use_error_page(true);
2943 } 2945 }
2944 2946
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
4126 4128
4127 #if defined(ENABLE_BROWSER_CDMS) 4129 #if defined(ENABLE_BROWSER_CDMS)
4128 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 4130 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
4129 if (!cdm_manager_) 4131 if (!cdm_manager_)
4130 cdm_manager_ = new RendererCdmManager(this); 4132 cdm_manager_ = new RendererCdmManager(this);
4131 return cdm_manager_; 4133 return cdm_manager_;
4132 } 4134 }
4133 #endif // defined(ENABLE_BROWSER_CDMS) 4135 #endif // defined(ENABLE_BROWSER_CDMS)
4134 4136
4135 } // namespace content 4137 } // namespace content
OLDNEW
« content/public/renderer/document_state.h ('K') | « content/public/renderer/document_state.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698