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

Side by Side Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2419093002: Revert of Preserving Content-Type header from http request in OpenURL path. (Closed)
Patch Set: Manually resolved conflicts with r425338 in navigator_impl.cc. Created 4 years, 2 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
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/browser/frame_host/render_frame_host_impl.h" 5 #include "content/browser/frame_host/render_frame_host_impl.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 2382 matching lines...) Expand 10 before | Expand all | Expand 10 after
2393 2393
2394 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params, 2394 void RenderFrameHostImpl::OpenURL(const FrameHostMsg_OpenURL_Params& params,
2395 SiteInstance* source_site_instance) { 2395 SiteInstance* source_site_instance) {
2396 GURL validated_url(params.url); 2396 GURL validated_url(params.url);
2397 GetProcess()->FilterURL(false, &validated_url); 2397 GetProcess()->FilterURL(false, &validated_url);
2398 2398
2399 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url", 2399 TRACE_EVENT1("navigation", "RenderFrameHostImpl::OpenURL", "url",
2400 validated_url.possibly_invalid_spec()); 2400 validated_url.possibly_invalid_spec());
2401 frame_tree_node_->navigator()->RequestOpenURL( 2401 frame_tree_node_->navigator()->RequestOpenURL(
2402 this, validated_url, params.uses_post, params.resource_request_body, 2402 this, validated_url, params.uses_post, params.resource_request_body,
2403 params.extra_headers, source_site_instance, params.referrer, 2403 source_site_instance, params.referrer, params.disposition,
2404 params.disposition, params.should_replace_current_entry, 2404 params.should_replace_current_entry, params.user_gesture);
2405 params.user_gesture);
2406 } 2405 }
2407 2406
2408 void RenderFrameHostImpl::Stop() { 2407 void RenderFrameHostImpl::Stop() {
2409 Send(new FrameMsg_Stop(routing_id_)); 2408 Send(new FrameMsg_Stop(routing_id_));
2410 } 2409 }
2411 2410
2412 void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation, 2411 void RenderFrameHostImpl::DispatchBeforeUnload(bool for_navigation,
2413 bool is_reload) { 2412 bool is_reload) {
2414 DCHECK(for_navigation || !is_reload); 2413 DCHECK(for_navigation || !is_reload);
2415 2414
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
3184 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind( 3183 web_bluetooth_service_->SetClientConnectionErrorHandler(base::Bind(
3185 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this))); 3184 &RenderFrameHostImpl::DeleteWebBluetoothService, base::Unretained(this)));
3186 return web_bluetooth_service_.get(); 3185 return web_bluetooth_service_.get();
3187 } 3186 }
3188 3187
3189 void RenderFrameHostImpl::DeleteWebBluetoothService() { 3188 void RenderFrameHostImpl::DeleteWebBluetoothService() {
3190 web_bluetooth_service_.reset(); 3189 web_bluetooth_service_.reset();
3191 } 3190 }
3192 3191
3193 } // namespace content 3192 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/frame_host/render_frame_host_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698