From 88942a2dab7da11dc89b4fe95151fdefa6cef036 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Thu, 19 Aug 2010 20:34:43 +0000 Subject: 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 --- chrome/browser/dom_ui/dom_ui.cc | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) (limited to 'chrome/browser/dom_ui/dom_ui.cc') 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(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(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(); } -- cgit v1.1