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/browser/automation | |
| 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/browser/automation')
| -rw-r--r-- | chrome/browser/automation/automation_provider.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/automation/automation_provider.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc index 93aad4d..b0c09ac 100644 --- a/chrome/browser/automation/automation_provider.cc +++ b/chrome/browser/automation/automation_provider.cc @@ -1831,7 +1831,7 @@ void AutomationProvider::SetBooleanPreference(int handle, // Gets the current used encoding name of the page in the specified tab. void AutomationProvider::GetPageCurrentEncoding( - int tab_handle, std::wstring* current_encoding) { + int tab_handle, std::string* current_encoding) { if (tab_tracker_->ContainsHandle(tab_handle)) { NavigationController* nav = tab_tracker_->GetResource(tab_handle); Browser* browser = FindAndActivateTab(nav); @@ -1844,7 +1844,7 @@ void AutomationProvider::GetPageCurrentEncoding( // Gets the current used encoding name of the page in the specified tab. void AutomationProvider::OverrideEncoding(int tab_handle, - const std::wstring& encoding_name, + const std::string& encoding_name, bool* success) { *success = false; #if defined(OS_WIN) diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h index ca2d611..6543a2f 100644 --- a/chrome/browser/automation/automation_provider.h +++ b/chrome/browser/automation/automation_provider.h @@ -432,12 +432,12 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>, bool* success); // Gets the current used encoding name of the page in the specified tab. - void GetPageCurrentEncoding(int tab_handle, std::wstring* current_encoding); + void GetPageCurrentEncoding(int tab_handle, std::string* current_encoding); // Uses the specified encoding to override the encoding of the page in the // specified tab. void OverrideEncoding(int tab_handle, - const std::wstring& encoding_name, + const std::string& encoding_name, bool* success); void SavePackageShouldPromptUser(bool should_prompt); |