summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host/java
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 05:29:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-02 05:29:53 +0000
commit8790210c68de5ab29e54a46f761a7a8d60430334 (patch)
tree159098319252d715c174230adbeb88338a6f67e4 /content/browser/renderer_host/java
parent05fd507a71a552edc3290adc35c45dfdc13d251a (diff)
downloadchromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.zip
chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.gz
chromium_src-8790210c68de5ab29e54a46f761a7a8d60430334.tar.bz2
Move EmptyString, kWhitespace and the BOM to base.
This moves EmptyString*, kWhitespace*, and the UTF 8 Byte Order Marker to the base:: namespace. Many of them just got changed to a default-constructed string when a reference was not required. I qualified some string16s with base:: when I was changing adjacent code. I need to do another pass to finish these up. BUG= TBR=sky@chromium.org Review URL: https://codereview.chromium.org/89243003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/java')
-rw-r--r--content/browser/renderer_host/java/java_method.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/browser/renderer_host/java/java_method.cc b/content/browser/renderer_host/java/java_method.cc
index ef2d097..5a654fe 100644
--- a/content/browser/renderer_host/java/java_method.cc
+++ b/content/browser/renderer_host/java/java_method.cc
@@ -86,7 +86,7 @@ std::string BinaryNameToJNIName(const std::string& binary_name,
return jni_name;
}
NOTREACHED();
- return EmptyString();
+ return std::string();
}
} // namespace