trunk/src/chrome/browser/chromeos/offline/offline_load_page.cc - Issue 235883010: Revert 262846, as the revert has now been merged to M35.

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: trunk/src/chrome/browser/chromeos/offline/offline_load_page.cc

Issue 235883010: Revert 262846, as the revert has now been merged to M35. (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 8 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:

Index: trunk/src/chrome/browser/chromeos/offline/offline_load_page.cc

===================================================================

--- trunk/src/chrome/browser/chromeos/offline/offline_load_page.cc (revision 263955)

+++ trunk/src/chrome/browser/chromeos/offline/offline_load_page.cc (working copy)

@@ -97,7 +97,9 @@

profile->GetPrefs()->GetString(prefs::kAcceptLanguages);

LocalizedError::GetStrings(net::ERR_INTERNET_DISCONNECTED,

net::kErrorDomain, url_, false, false, locale,

- accept_languages, &error_strings);

+ accept_languages,

+ scoped_ptr<LocalizedError::ErrorPageParams>(),

+ &error_strings);

resource_id = IDR_OFFLINE_NET_LOAD_HTML;

}

« no previous file with comments | « no previous file | trunk/src/chrome/browser/errorpage_browsertest.cc » ('j') | no next file with comments »