chrome/renderer/net/net_error_helper.cc - Issue 105493002: Use base namespace for string16 in chrome/renderer.

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/net/net_error_helper.cc

Issue 105493002: Use base namespace for string16 in chrome/renderer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 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:

Index: chrome/renderer/net/net_error_helper.cc

diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc

index 18d0810483536d2fb5a03878d24d3fa7d024523e..dc170ceb49dc9c8b1f62d37e818ad119e355ec0c 100644

--- a/chrome/renderer/net/net_error_helper.cc

+++ b/chrome/renderer/net/net_error_helper.cc

@@ -228,7 +228,7 @@ void NetErrorHelper::UpdateErrorPage() {

std::string js = "if (window.updateForDnsProbe) "

"updateForDnsProbe(" + json + ");";

- string16 js16;

+ base::string16 js16;

if (!UTF8ToUTF16(js.c_str(), js.length(), &js16)) {

NOTREACHED();

return;

@@ -238,7 +238,7 @@ void NetErrorHelper::UpdateErrorPage() {

<< chrome_common_net::DnsProbeStatusToString(last_probe_status_);

DVLOG(2) << "New strings: " << js;

- string16 frame_xpath;

+ base::string16 frame_xpath;

render_view()->EvaluateScript(frame_xpath, js16, 0, false);

UMA_HISTOGRAM_ENUMERATION("DnsProbe.ErrorPageUpdateStatus",

« no previous file with comments | « chrome/renderer/mock_printer.h ('k') | chrome/renderer/plugins/chrome_plugin_placeholder.h » ('j') | no next file with comments »