Pass DictionaryValues directly to Autofill WebUI handlers

chrome/browser/dom_ui/options/autofill_options_handler.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/dom_ui/options/autofill_options_handler.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/string16.h"
@@ skipping 232 matching lines @@
   AutoFillProfile* profile = personal_data_->GetProfileByGUID(guid);
   if (!profile) {
     // There is a race where a user can click once on the close button and
     // quickly click again on the list item before the item is removed (since
     // the list is not updated until the model tells the list an item has been
     // removed). This will activate the editor for a profile that has been
     // removed. Do nothing in that case.
     return;
   }
 
-  // TODO(jhawkins): This is hacky because we can't send DictionaryValue
-  // directly to CallJavascriptFunction().
-  ListValue addressList;
-  DictionaryValue* address = new DictionaryValue();
-  address->SetString("guid", profile->guid());
-  address->SetString("fullName",
-                     profile->GetFieldText(AutoFillType(NAME_FULL)));
-  address->SetString("companyName",
-                     profile->GetFieldText(AutoFillType(COMPANY_NAME)));
-  address->SetString("addrLine1",
-                     profile->GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)));
-  address->SetString("addrLine2",
-                     profile->GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)));
-  address->SetString("city",
-                     profile->GetFieldText(AutoFillType(ADDRESS_HOME_CITY)));
-  address->SetString("state",
-                     profile->GetFieldText(AutoFillType(ADDRESS_HOME_STATE)));
-  address->SetString("zipCode",
-                     profile->GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)));
-  address->SetString("country",
+  DictionaryValue address;

[James Hawkins, 2011/02/12 20:37:34]

We can send DictionaryValue now?

[Ilya Sherman, 2011/02/13 12:24:59]

It seemed to work when I tried it, at any rate.

[arv (Not doing code reviews), 2011/02/14 18:41:44]

Haven't we always been able to send all Value types from C++ to
JS?CallJavascriptFunction JSON serializes the params so I DictionaryValue works
fine.

[James Hawkins, 2011/02/16 20:43:59]

It's cool that we can now, and I'm not sure what's changed to fix it, but I know
when I originally wrote this, passing in a DictionaryValue didn't work.

+  address.SetString("guid", profile->guid());
+  address.SetString("fullName",
+                    profile->GetFieldText(AutoFillType(NAME_FULL)));
+  address.SetString("companyName",
+                    profile->GetFieldText(AutoFillType(COMPANY_NAME)));
+  address.SetString("addrLine1",
+                    profile->GetFieldText(AutoFillType(ADDRESS_HOME_LINE1)));
+  address.SetString("addrLine2",
+                    profile->GetFieldText(AutoFillType(ADDRESS_HOME_LINE2)));
+  address.SetString("city",
+                    profile->GetFieldText(AutoFillType(ADDRESS_HOME_CITY)));
+  address.SetString("state",
+                    profile->GetFieldText(AutoFillType(ADDRESS_HOME_STATE)));
+  address.SetString("zipCode",
+                    profile->GetFieldText(AutoFillType(ADDRESS_HOME_ZIP)));
+  address.SetString("country",
                      profile->GetFieldText(AutoFillType(ADDRESS_HOME_COUNTRY)));
-  address->SetString(
+  address.SetString(
       "phone",
       profile->GetFieldText(AutoFillType(PHONE_HOME_WHOLE_NUMBER)));
-  address->SetString(
+  address.SetString(
       "fax",
       profile->GetFieldText(AutoFillType(PHONE_FAX_WHOLE_NUMBER)));
-  address->SetString("email",
+  address.SetString("email",
                      profile->GetFieldText(AutoFillType(EMAIL_ADDRESS)));
-  addressList.Append(address);
 
-  dom_ui_->CallJavascriptFunction(L"AutoFillOptions.editAddress",
-                                  addressList);
+  dom_ui_->CallJavascriptFunction(L"AutoFillOptions.editAddress", address);
 }
 
 void AutoFillOptionsHandler::LoadCreditCardEditor(const ListValue* args) {
   DCHECK(personal_data_->IsDataLoaded());
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
   }
 
   CreditCard* credit_card = personal_data_->GetCreditCardByGUID(guid);
   if (!credit_card) {
     // There is a race where a user can click once on the close button and
     // quickly click again on the list item before the item is removed (since
     // the list is not updated until the model tells the list an item has been
     // removed). This will activate the editor for a profile that has been
     // removed. Do nothing in that case.
     return;
   }
 
-  // TODO(jhawkins): This is hacky because we can't send DictionaryValue
-  // directly to CallJavascriptFunction().
-  ListValue credit_card_list;
-  DictionaryValue* credit_card_data = new DictionaryValue();
-  credit_card_data->SetString("guid", credit_card->guid());
-  credit_card_data->SetString(
+  DictionaryValue credit_card_data;
+  credit_card_data.SetString("guid", credit_card->guid());
+  credit_card_data.SetString(
       "nameOnCard",
       credit_card->GetFieldText(AutoFillType(CREDIT_CARD_NAME)));
-  credit_card_data->SetString(
+  credit_card_data.SetString(
       "creditCardNumber",
       credit_card->GetFieldText(AutoFillType(CREDIT_CARD_NUMBER)));
-  credit_card_data->SetString("obfuscatedCardNumber",
-                              credit_card->ObfuscatedNumber());
-  credit_card_data->SetString(
+  credit_card_data.SetString("obfuscatedCardNumber",
+                             credit_card->ObfuscatedNumber());
+  credit_card_data.SetString(
       "expirationMonth",
       credit_card->GetFieldText(AutoFillType(CREDIT_CARD_EXP_MONTH)));
-  credit_card_data->SetString(
+  credit_card_data.SetString(
       "expirationYear",
       credit_card->GetFieldText(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR)));
-  credit_card_list.Append(credit_card_data);
 
   dom_ui_->CallJavascriptFunction(L"AutoFillOptions.editCreditCard",
-                                  credit_card_list);
+                                  credit_card_data);
 }
 
 void AutoFillOptionsHandler::SetAddress(const ListValue* args) {
   if (!personal_data_->IsDataLoaded())
     return;
 
   std::string guid;
   if (!args->GetString(0, &guid)) {
     NOTREACHED();
     return;
@@ skipping 55 matching lines @@
   if (args->GetString(4, &value))
     credit_card.SetInfo(AutoFillType(CREDIT_CARD_EXP_4_DIGIT_YEAR), value);
 
   if (!guid::IsValidGUID(credit_card.guid())) {
     credit_card.set_guid(guid::GenerateGUID());
     personal_data_->AddCreditCard(credit_card);
   } else {
     personal_data_->UpdateCreditCard(credit_card);
   }
 }