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

Side by Side Diff: chrome/browser/renderer_host/render_view_host.cc

Issue 5254005: Do not reset the content settings delegate's cookies when a network error occurred. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/tab_contents
Patch Set: rebase Created 10 years 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_view_host_delegate.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 (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/renderer_host/render_view_host.h" 5 #include "chrome/browser/renderer_host/render_view_host.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 const std::string& security_origin) { 1183 const std::string& security_origin) {
1184 RenderViewHostDelegate::Resource* resource_delegate = 1184 RenderViewHostDelegate::Resource* resource_delegate =
1185 delegate_->GetResourceDelegate(); 1185 delegate_->GetResourceDelegate();
1186 if (resource_delegate) 1186 if (resource_delegate)
1187 resource_delegate->DidRunInsecureContent(security_origin); 1187 resource_delegate->DidRunInsecureContent(security_origin);
1188 } 1188 }
1189 1189
1190 void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(int64 frame_id, 1190 void RenderViewHost::OnMsgDidStartProvisionalLoadForFrame(int64 frame_id,
1191 bool is_main_frame, 1191 bool is_main_frame,
1192 const GURL& url) { 1192 const GURL& url) {
1193 bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL);
1193 GURL validated_url(url); 1194 GURL validated_url(url);
1194 FilterURL(ChildProcessSecurityPolicy::GetInstance(), 1195 FilterURL(ChildProcessSecurityPolicy::GetInstance(),
1195 process()->id(), &validated_url); 1196 process()->id(), &validated_url);
1196 1197
1197 RenderViewHostDelegate::Resource* resource_delegate = 1198 RenderViewHostDelegate::Resource* resource_delegate =
1198 delegate_->GetResourceDelegate(); 1199 delegate_->GetResourceDelegate();
1199 if (resource_delegate) { 1200 if (resource_delegate) {
1200 resource_delegate->DidStartProvisionalLoadForFrame( 1201 resource_delegate->DidStartProvisionalLoadForFrame(
1201 this, frame_id, is_main_frame, validated_url); 1202 this, frame_id, is_main_frame, is_error_page, validated_url);
1202 } 1203 }
1203 } 1204 }
1204 1205
1205 void RenderViewHost::OnMsgDidFailProvisionalLoadWithError( 1206 void RenderViewHost::OnMsgDidFailProvisionalLoadWithError(
1206 int64 frame_id, 1207 int64 frame_id,
1207 bool is_main_frame, 1208 bool is_main_frame,
1208 int error_code, 1209 int error_code,
1209 const GURL& url, 1210 const GURL& url,
1210 bool showing_repost_interstitial) { 1211 bool showing_repost_interstitial) {
1211 VLOG(1) << "Failed Provisional Load: " << url.possibly_invalid_spec() 1212 VLOG(1) << "Failed Provisional Load: " << url.possibly_invalid_spec()
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after
2250 if (printer_query.get()) { 2251 if (printer_query.get()) {
2251 BrowserThread::PostTask( 2252 BrowserThread::PostTask(
2252 BrowserThread::IO, FROM_HERE, 2253 BrowserThread::IO, FROM_HERE,
2253 NewRunnableMethod(printer_query.get(), 2254 NewRunnableMethod(printer_query.get(),
2254 &printing::PrinterQuery::StopWorker)); 2255 &printing::PrinterQuery::StopWorker));
2255 } 2256 }
2256 2257
2257 // Send the printingDone msg for now. 2258 // Send the printingDone msg for now.
2258 Send(new ViewMsg_PrintingDone(routing_id(), -1, true)); 2259 Send(new ViewMsg_PrintingDone(routing_id(), -1, true));
2259 } 2260 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698