summaryrefslogtreecommitdiffstats
path: root/chrome/browser/dom_ui/dom_ui.cc
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 20:34:43 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-19 20:34:43 +0000
commit88942a2dab7da11dc89b4fe95151fdefa6cef036 (patch)
tree3047b9779e5b8b8a9a04c26e83ebc478e825f4b5 /chrome/browser/dom_ui/dom_ui.cc
parent2acaa4de809c66b8b826e3bf93930e2b3bf4c65f (diff)
downloadchromium_src-88942a2dab7da11dc89b4fe95151fdefa6cef036.zip
chromium_src-88942a2dab7da11dc89b4fe95151fdefa6cef036.tar.gz
chromium_src-88942a2dab7da11dc89b4fe95151fdefa6cef036.tar.bz2
DOM UI: Change DOMMessageHandler callback arg type to ListValue.
The parameter describes a list of Values that act as parameters to the callback. It is always a ListValue. It should be typed as such. BUG=none TEST=compile; manual testing Review URL: http://codereview.chromium.org/3146019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui/dom_ui.cc')
-rw-r--r--chrome/browser/dom_ui/dom_ui.cc27
1 files changed, 11 insertions, 16 deletions
diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc
index a5b965a..5fb2fb8 100644
--- a/chrome/browser/dom_ui/dom_ui.cc
+++ b/chrome/browser/dom_ui/dom_ui.cc
@@ -161,25 +161,20 @@ void DOMMessageHandler::SetURLAndTitle(DictionaryValue* dictionary,
dictionary->SetString("title", title_to_set);
}
-bool DOMMessageHandler::ExtractIntegerValue(const Value* value, int* out_int) {
- if (value && value->GetType() == Value::TYPE_LIST) {
- const ListValue* list_value = static_cast<const ListValue*>(value);
- std::string string_value;
- if (list_value->GetString(0, &string_value)) {
- base::StringToInt(string_value, out_int);
- return true;
- }
- }
+bool DOMMessageHandler::ExtractIntegerValue(const ListValue* value,
+ int* out_int) {
+ std::string string_value;
+ if (value->GetString(0, &string_value))
+ return base::StringToInt(string_value, out_int);
+ NOTREACHED();
return false;
}
// TODO(viettrungluu): convert to string16 (or UTF-8 std::string?).
-std::wstring DOMMessageHandler::ExtractStringValue(const Value* value) {
- if (value && value->GetType() == Value::TYPE_LIST) {
- const ListValue* list_value = static_cast<const ListValue*>(value);
- string16 string16_value;
- if (list_value->GetString(0, &string16_value))
- return UTF16ToWideHack(string16_value);
- }
+std::wstring DOMMessageHandler::ExtractStringValue(const ListValue* value) {
+ string16 string16_value;
+ if (value->GetString(0, &string16_value))
+ return UTF16ToWideHack(string16_value);
+ NOTREACHED();
return std::wstring();
}