summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-15 12:11:11 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-15 12:11:11 +0000
commita77fa2dc9cb9a10a31688a1bb24a9101194d51af (patch)
tree9be37414818cd5be282ec26ee0d0f9b8c186ea29 /webkit
parent055d7f268366be957e83bff0dfb2a7f5fcf3f3a7 (diff)
downloadchromium_src-a77fa2dc9cb9a10a31688a1bb24a9101194d51af.zip
chromium_src-a77fa2dc9cb9a10a31688a1bb24a9101194d51af.tar.gz
chromium_src-a77fa2dc9cb9a10a31688a1bb24a9101194d51af.tar.bz2
base: Get rid of 'using' declaration of StringAppendF.
Update the callers to append base:: in the calls to StringAppendF. BUG=None TEST=trybots Review URL: http://codereview.chromium.org/4974001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/appcache/view_appcache_internals_job.cc8
-rw-r--r--webkit/blob/view_blob_internals_job.cc10
-rw-r--r--webkit/glue/plugins/plugin_list_posix.cc2
-rw-r--r--webkit/glue/user_agent.cc4
-rw-r--r--webkit/glue/webkit_glue.cc6
5 files changed, 15 insertions, 15 deletions
diff --git a/webkit/appcache/view_appcache_internals_job.cc b/webkit/appcache/view_appcache_internals_job.cc
index 93390cc..0819cd7 100644
--- a/webkit/appcache/view_appcache_internals_job.cc
+++ b/webkit/appcache/view_appcache_internals_job.cc
@@ -66,10 +66,10 @@ void EndHTML(std::string* out) {
void DrawCommandButton(const std::string& title,
const std::string& command,
std::string* data) {
- StringAppendF(data, "<input type=\"button\" value=\"%s\" "
- "onclick=\"RemoveCommand('%s')\" />",
- title.c_str(),
- command.c_str());
+ base::StringAppendF(data, "<input type=\"button\" value=\"%s\" "
+ "onclick=\"RemoveCommand('%s')\" />",
+ title.c_str(),
+ command.c_str());
}
void AddLiTag(const std::string& element_title,
diff --git a/webkit/blob/view_blob_internals_job.cc b/webkit/blob/view_blob_internals_job.cc
index 36463b9..00c3eb3 100644
--- a/webkit/blob/view_blob_internals_job.cc
+++ b/webkit/blob/view_blob_internals_job.cc
@@ -88,11 +88,11 @@ void AddHTMLListItem(const std::string& element_title,
void AddHTMLButton(const std::string& title,
const std::string& command,
std::string* out) {
- StringAppendF(out,
- "<input type=\"button\" value=\"%s\" "
- "onclick=\"SubmitCommand('%s')\" />",
- title.c_str(),
- command.c_str());
+ base::StringAppendF(out,
+ "<input type=\"button\" value=\"%s\" "
+ "onclick=\"SubmitCommand('%s')\" />",
+ title.c_str(),
+ command.c_str());
}
} // namespace
diff --git a/webkit/glue/plugins/plugin_list_posix.cc b/webkit/glue/plugins/plugin_list_posix.cc
index 682381c..654c0c5 100644
--- a/webkit/glue/plugins/plugin_list_posix.cc
+++ b/webkit/glue/plugins/plugin_list_posix.cc
@@ -55,7 +55,7 @@ bool IsBlacklistedBySha1sum(const FilePath& path) {
std::string sha1 = base::SHA1HashString(file_content);
std::string sha1_readable;
for (size_t j = 0; j < sha1.size(); j++)
- StringAppendF(&sha1_readable, "%02x", sha1[j] & 0xFF);
+ base::StringAppendF(&sha1_readable, "%02x", sha1[j] & 0xFF);
if (bad_entries[i].sha1 == sha1_readable)
return true;
}
diff --git a/webkit/glue/user_agent.cc b/webkit/glue/user_agent.cc
index 2babb49..4867c27 100644
--- a/webkit/glue/user_agent.cc
+++ b/webkit/glue/user_agent.cc
@@ -52,7 +52,7 @@ std::string BuildOSCpuInfo() {
}
#endif
- StringAppendF(
+ base::StringAppendF(
&os_cpu,
#if defined(OS_WIN)
"Windows NT %d.%d",
@@ -102,7 +102,7 @@ void BuildUserAgent(bool mimic_windows, std::string* result) {
std::string product = GetProductVersion();
// Derived from Safari's UA string.
- StringAppendF(
+ base::StringAppendF(
result,
"Mozilla/5.0 (%s; %c; %s; %s) AppleWebKit/%d.%d"
" (KHTML, like Gecko) %s Safari/%d.%d",
diff --git a/webkit/glue/webkit_glue.cc b/webkit/glue/webkit_glue.cc
index c7a7d10..67b61ba 100644
--- a/webkit/glue/webkit_glue.cc
+++ b/webkit/glue/webkit_glue.cc
@@ -157,11 +157,11 @@ std::wstring DumpFrameScrollPosition(WebFrame* web_frame, bool recursive) {
if (offset.width() > 0 || offset.height() > 0) {
if (web_frame->parent()) {
- StringAppendF(&result, L"frame '%ls' ", UTF16ToWide(
+ base::StringAppendF(&result, L"frame '%ls' ", UTF16ToWide(
web_frame->name()).c_str());
}
- StringAppendF(&result, L"scrolled to %d,%d\n",
- offset.width(), offset.height());
+ base::StringAppendF(&result, L"scrolled to %d,%d\n",
+ offset.width(), offset.height());
}
if (recursive) {