diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-04 22:23:40 +0000 |
| commit | 41fc0320689c888625b5f13b5540a85590d6f830 (patch) | |
| tree | 121dc85682d85da5eb8ff3ef645985a9bb61d635 /chrome/test/automation/tab_proxy.h | |
| parent | fe2c7f0cb1d2513e357f3c840bb1aa00739aafdf (diff) | |
| download | chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.zip chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.gz chromium_src-41fc0320689c888625b5f13b5540a85590d6f830.tar.bz2 | |
Convert std::wstring encoding names to std::string in a bunch of files.
BUG=8647 (http://crbug.com/8647)
TEST=run unit_tests.exe and ui_tests.exe
Original patch by Thiago Farina <thiago.farina@gmail.com> at
http://codereview.chromium.org/179057/show
Some linux related fixes by me.
Review URL: http://codereview.chromium.org/192017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation/tab_proxy.h')
| -rw-r--r-- | chrome/test/automation/tab_proxy.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index c8bb83e..e8dbe49 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -304,10 +304,10 @@ class TabProxy : public AutomationResourceProxy { bool WaitForNavigation(int64 last_navigation_time); // Gets the current used encoding of the page in the tab. - bool GetPageCurrentEncoding(std::wstring* encoding); + bool GetPageCurrentEncoding(std::string* encoding); // Uses the specified encoding to override encoding of the page in the tab. - bool OverrideEncoding(const std::wstring& encoding); + bool OverrideEncoding(const std::string& encoding); #if defined(OS_WIN) // Resizes the tab window. |