chrome/renderer/chrome_content_renderer_client.cc - Issue 10830218: Move localized_error from chrome/renderer into chrome/common.

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/renderer/chrome_content_renderer_client.cc

Issue 10830218: Move localized_error from chrome/renderer into chrome/common. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 4 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: chrome/renderer/chrome_content_renderer_client.cc

diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc

index a386ac0dcf94dfbad4c50a2e3da67bc21e5e79b9..538b6626c9ec9844ab8a1155205d8bc123ac2cc6 100644

--- a/chrome/renderer/chrome_content_renderer_client.cc

+++ b/chrome/renderer/chrome_content_renderer_client.cc

@@ -24,6 +24,7 @@

#include "chrome/common/extensions/extension_set.h"

#include "chrome/common/external_ipc_fuzzer.h"

#include "chrome/common/jstemplate_builder.h"

+#include "chrome/common/localized_error.h"

#include "chrome/common/render_messages.h"

#include "chrome/common/url_constants.h"

#include "chrome/renderer/autofill/autofill_agent.h"

@@ -42,7 +43,6 @@

#include "chrome/renderer/extensions/miscellaneous_bindings.h"

#include "chrome/renderer/external_extension.h"

#include "chrome/renderer/loadtimes_extension_bindings.h"

-#include "chrome/renderer/localized_error.h"

#include "chrome/renderer/net/renderer_net_predictor.h"

#include "chrome/renderer/page_click_tracker.h"

#include "chrome/renderer/page_load_histograms.h"

@@ -685,7 +685,8 @@ void ChromeContentRendererClient::GetNavigationErrorStrings(

if (is_repost) {

LocalizedError::GetFormRepostStrings(failed_url, &error_strings);

} else {

- LocalizedError::GetStrings(error, &error_strings);

+ LocalizedError::GetStrings(error, &error_strings,

+ RenderThread::Get()->GetLocale());

}

resource_id = IDR_NET_ERROR_HTML;

}