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

Unified Diff: android_webview/renderer/aw_render_view_ext.cc

Issue 100453010: Add base:: to string16s in android_webview/. (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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/renderer/aw_content_renderer_client.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/renderer/aw_render_view_ext.cc
diff --git a/android_webview/renderer/aw_render_view_ext.cc b/android_webview/renderer/aw_render_view_ext.cc
index 4865bf32ca20961dd2bd2ca66b58174ad9032236..83f1c7a72aa16593eb8c39211f79edfbc721cbc8 100644
--- a/android_webview/renderer/aw_render_view_ext.cc
+++ b/android_webview/renderer/aw_render_view_ext.cc
@@ -37,11 +37,12 @@ namespace android_webview {
namespace {
-GURL GetAbsoluteUrl(const blink::WebNode& node, const string16& url_fragment) {
+GURL GetAbsoluteUrl(const blink::WebNode& node,
+ const base::string16& url_fragment) {
return GURL(node.document().completeURL(url_fragment));
}
-string16 GetHref(const blink::WebElement& element) {
+base::string16 GetHref(const blink::WebElement& element) {
// Get the actual 'href' attribute, which might relative if valid or can
// possibly contain garbage otherwise, so not using absoluteLinkURL here.
return element.getAttribute("href");
@@ -73,7 +74,7 @@ bool RemovePrefixAndAssignIfMatches(const base::StringPiece& prefix,
url_util::DecodeURLEscapeSequences(spec.data() + prefix.length(),
spec.length() - prefix.length(), &output);
std::string decoded_url = UTF16ToUTF8(
- string16(output.data(), output.length()));
+ base::string16(output.data(), output.length()));
dest->assign(decoded_url.begin(), decoded_url.end());
return true;
}
« no previous file with comments | « android_webview/renderer/aw_content_renderer_client.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698