chrome/browser/tab_contents/tab_contents.cc - Issue 5254005: Do not reset the content settings delegate's cookies when a network error occurred.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/tab_contents/tab_contents.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: browser_test Created 10 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/renderer_host/test/render_view_host_browsertest.cc ('K') | « chrome/browser/tab_contents/tab_contents.h ('k') | chrome/test/data/redirect-loop.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/tab_contents.cc

diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc

index 363157535a9966f1d1df89e4ec6d2b81393d23f5..025fb2b8af16845b004a6efbcde5c6dac6c3b7b1 100644

--- a/chrome/browser/tab_contents/tab_contents.cc

+++ b/chrome/browser/tab_contents/tab_contents.cc

@@ -2129,6 +2129,7 @@ void TabContents::DidStartProvisionalLoadForFrame(

RenderViewHost* render_view_host,

long long frame_id,

bool is_main_frame,

+ bool is_unreachable_web_data,

const GURL& url) {

ProvisionalLoadDetails details(is_main_frame,

controller_.IsURLInPageNavigation(url),

@@ -2138,7 +2139,11 @@ void TabContents::DidStartProvisionalLoadForFrame(

Source<NavigationController>(&controller_),

Details<ProvisionalLoadDetails>(&details));

if (is_main_frame) {

- content_settings_delegate_->ClearCookieSpecificContentSettings();

+ // If we're displaying a network error page do not reset the content

+ // settings delegate's cookies so the user has a chance to modify cookie

+ // settings.

+ if (!is_unreachable_web_data)

+ content_settings_delegate_->ClearCookieSpecificContentSettings();

content_settings_delegate_->ClearGeolocationContentSettings();

}