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

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

Issue 2347163002: s/NPN/ALPN/ (Closed)
Patch Set: Re: #12. Created 4 years, 3 months 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
« no previous file with comments | « content/public/renderer/document_state.cc ('k') | net/base/net_error_list.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 4154 matching lines...) Expand 10 before | Expand all | Expand 10 after
4165 4165
4166 DocumentState* document_state = 4166 DocumentState* document_state =
4167 DocumentState::FromDataSource(frame_->provisionalDataSource()); 4167 DocumentState::FromDataSource(frame_->provisionalDataSource());
4168 int http_status_code = response.httpStatusCode(); 4168 int http_status_code = response.httpStatusCode();
4169 4169
4170 // Record page load flags. 4170 // Record page load flags.
4171 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response); 4171 WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response);
4172 if (extra_data) { 4172 if (extra_data) {
4173 document_state->set_was_fetched_via_spdy( 4173 document_state->set_was_fetched_via_spdy(
4174 extra_data->was_fetched_via_spdy()); 4174 extra_data->was_fetched_via_spdy());
4175 document_state->set_was_npn_negotiated( 4175 document_state->set_was_alpn_negotiated(extra_data->was_alpn_negotiated());
4176 extra_data->was_npn_negotiated()); 4176 document_state->set_alpn_negotiated_protocol(
4177 document_state->set_npn_negotiated_protocol( 4177 extra_data->alpn_negotiated_protocol());
4178 extra_data->npn_negotiated_protocol());
4179 document_state->set_was_alternate_protocol_available( 4178 document_state->set_was_alternate_protocol_available(
4180 extra_data->was_alternate_protocol_available()); 4179 extra_data->was_alternate_protocol_available());
4181 document_state->set_connection_info( 4180 document_state->set_connection_info(
4182 extra_data->connection_info()); 4181 extra_data->connection_info());
4183 document_state->set_was_fetched_via_proxy( 4182 document_state->set_was_fetched_via_proxy(
4184 extra_data->was_fetched_via_proxy()); 4183 extra_data->was_fetched_via_proxy());
4185 document_state->set_proxy_server( 4184 document_state->set_proxy_server(
4186 extra_data->proxy_server()); 4185 extra_data->proxy_server());
4187 } 4186 }
4188 InternalDocumentStateData* internal_data = 4187 InternalDocumentStateData* internal_data =
(...skipping 2199 matching lines...) Expand 10 before | Expand all | Expand 10 after
6388 // event target. Potentially a Pepper plugin will receive the event. 6387 // event target. Potentially a Pepper plugin will receive the event.
6389 // In order to tell whether a plugin gets the last mouse event and which it 6388 // In order to tell whether a plugin gets the last mouse event and which it
6390 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6389 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6391 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6390 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6392 // |pepper_last_mouse_event_target_|. 6391 // |pepper_last_mouse_event_target_|.
6393 pepper_last_mouse_event_target_ = nullptr; 6392 pepper_last_mouse_event_target_ = nullptr;
6394 #endif 6393 #endif
6395 } 6394 }
6396 6395
6397 } // namespace content 6396 } // namespace content
OLDNEW
« no previous file with comments | « content/public/renderer/document_state.cc ('k') | net/base/net_error_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698