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

Unified Diff: chrome/test/automation/tab_proxy.cc

Issue 192017: Convert std::wstring encoding names to std::string in a bunch of files. (Closed)
Patch Set: mac and linux fixes Created 11 years, 3 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/automation/tab_proxy.cc
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index 6a1cb0a4d3cfa565cdbace2e793e9209b4a8c278..85ab3fcc65c0ceef1f997ca0fadcc59bee3a3813 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -645,7 +645,7 @@ bool TabProxy::WaitForNavigation(int64 last_navigation_time) {
result == AUTOMATION_MSG_NAVIGATION_AUTH_NEEDED;
}
-bool TabProxy::GetPageCurrentEncoding(std::wstring* encoding) {
+bool TabProxy::GetPageCurrentEncoding(std::string* encoding) {
if (!is_valid())
return false;
@@ -654,7 +654,7 @@ bool TabProxy::GetPageCurrentEncoding(std::wstring* encoding) {
return succeeded;
}
-bool TabProxy::OverrideEncoding(const std::wstring& encoding) {
+bool TabProxy::OverrideEncoding(const std::string& encoding) {
if (!is_valid())
return false;
« no previous file with comments | « chrome/test/automation/tab_proxy.h ('k') | webkit/glue/webpreferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698