summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui
diff options
context:
space:
mode:
authordsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 01:01:50 +0000
committerdsh@google.com <dsh@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 01:01:50 +0000
commit41fb1d7d262e44d8561a5c4d6d7e353f638b56e8 (patch)
tree0b6159a725069a98f9fb6e6e451949a6ce37ccfa /chrome/browser/dom_ui
parent3131a289c0edff9d58da46cae16beae6bd6c0650 (diff)
downloadchromium_src-41fb1d7d262e44d8561a5c4d6d7e353f638b56e8.zip
chromium_src-41fb1d7d262e44d8561a5c4d6d7e353f638b56e8.tar.gz
chromium_src-41fb1d7d262e44d8561a5c4d6d7e353f638b56e8.tar.bz2
Get rid of wstring variants of StringToFoo.
Review URL: http://codereview.chromium.org/28281 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
-rw-r--r--chrome/browser/dom_ui/dom_ui.cc3
-rw-r--r--chrome/browser/dom_ui/history_ui.cc2
-rw-r--r--chrome/browser/dom_ui/new_tab_ui.cc2
3 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc
index 22e3382..b0efcad 100644
--- a/chrome/browser/dom_ui/dom_ui.cc
+++ b/chrome/browser/dom_ui/dom_ui.cc
@@ -148,7 +148,7 @@ bool DOMMessageHandler::ExtractIntegerValue(const Value* value, int* out_int) {
static_cast<const StringValue*>(list_member);
std::wstring wstring_value;
string_value->GetAsString(&wstring_value);
- *out_int = StringToInt(wstring_value);
+ *out_int = StringToInt(WideToUTF16Hack(wstring_value));
return true;
}
}
@@ -173,4 +173,3 @@ std::wstring DOMMessageHandler::ExtractStringValue(const Value* value) {
}
return std::wstring();
}
-
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index fcabc19..0f735d4 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -278,7 +278,7 @@ void BrowsingHistoryHandler::ExtractSearchHistoryArguments(const Value* value,
static_cast<const StringValue*>(list_member);
std::wstring wstring_value;
string_value->GetAsString(&wstring_value);
- *month = StringToInt(wstring_value);
+ *month = StringToInt(WideToUTF16Hack(wstring_value));
}
}
}
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 3b83c99..189f703 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -596,7 +596,7 @@ void RecentlyClosedTabsHandler::HandleReopenTab(const Value* content) {
static_cast<const StringValue*>(list_member);
std::wstring wstring_value;
if (string_value->GetAsString(&wstring_value)) {
- int session_to_restore = StringToInt(wstring_value);
+ int session_to_restore = StringToInt(WideToUTF16Hack(wstring_value));
tab_restore_service_->RestoreEntryById(browser, session_to_restore,
true);
// The current tab has been nuked at this point; don't touch any member