diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 20:46:40 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-03 20:46:40 +0000 |
| commit | 6470ee8f59dba5eecfce4a64d7ff3930ae716095 (patch) | |
| tree | 86e020619f32c56f5796a0ea20975c71607ac91f /chrome/browser/page_state.cc | |
| parent | 409993dec55a874e0659acf421a87070d450a262 (diff) | |
| download | chromium_src-6470ee8f59dba5eecfce4a64d7ff3930ae716095.zip chromium_src-6470ee8f59dba5eecfce4a64d7ff3930ae716095.tar.gz chromium_src-6470ee8f59dba5eecfce4a64d7ff3930ae716095.tar.bz2 | |
Revert dsh's change 10818
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/page_state.cc')
| -rw-r--r-- | chrome/browser/page_state.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/page_state.cc b/chrome/browser/page_state.cc index 3e013f2..827416c 100644 --- a/chrome/browser/page_state.cc +++ b/chrome/browser/page_state.cc @@ -28,7 +28,7 @@ void PageState::InitWithURL(const GURL& url) { // We know that the query string is UTF-8 since it's an internal URL. std::wstring value = UTF8ToWide( UnescapeURLComponent(escaped, UnescapeRule::REPLACE_PLUS_WITH_SPACE)); - state_->Set(UTF8ToUTF16(query_string.substr(keyComp.begin, keyComp.len)), + state_->Set(UTF8ToWide(query_string.substr(keyComp.begin, keyComp.len)), new StringValue(value)); } } @@ -59,11 +59,10 @@ void PageState::GetByteRepresentation(std::string* out) const { void PageState::SetProperty(const std::wstring& key, const std::wstring& value) { - state_->Set(WideToUTF16Hack(key), new StringValue(value)); + state_->Set(key, new StringValue(value)); } -bool PageState::GetProperty(const std::wstring& wkey, std::wstring* value) const { - string16 key(WideToUTF16(wkey)); +bool PageState::GetProperty(const std::wstring& key, std::wstring* value) const { if (state_->HasKey(key)) { Value* v; state_->Get(key, &v); |