Add usage display support for Extension IME.

chrome/browser/extensions/api/input_ime/input_ime_api.cc

 // Copyright (c) 2012 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/extensions/api/input_ime/input_ime_api.h"
 
 #include "base/json/json_writer.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
@@ skipping 643 matching lines @@
     ListValue* candidates,
     std::vector<chromeos::InputMethodEngine::Candidate>* output) {
   for (size_t i = 0; i < candidates->GetSize(); ++i) {
     DictionaryValue* candidate_dict;
     EXTENSION_FUNCTION_VALIDATE(candidates->GetDictionary(i, &candidate_dict));
 
     std::string candidate;
     int id;
     std::string label;
     std::string annotation;
+    chromeos::InputMethodEngine::UsageEntry usage_entry;
 
     EXTENSION_FUNCTION_VALIDATE(candidate_dict->GetString(keys::kCandidateKey,
                                                           &candidate));
     EXTENSION_FUNCTION_VALIDATE(candidate_dict->GetInteger(keys::kIdKey, &id));
 
     if (candidate_dict->HasKey(keys::kLabelKey)) {
       EXTENSION_FUNCTION_VALIDATE(candidate_dict->GetString(keys::kLabelKey,
                                                             &label));
     }
     if (candidate_dict->HasKey(keys::kAnnotationKey)) {
       EXTENSION_FUNCTION_VALIDATE(candidate_dict->GetString(
           keys::kAnnotationKey,
           &annotation));
     }
 
+    if (candidate_dict->HasKey(keys::kUsageKey)) {
+      DictionaryValue* usage_dict;
+      EXTENSION_FUNCTION_VALIDATE(candidate_dict->GetDictionary(keys::kUsageKey,
+                                                                &usage_dict));
+      if (usage_dict->HasKey(keys::kUsageTitleKey) &&
+          usage_dict->HasKey(keys::kUsageBodyKey)) {

[Matt Perry, 2012/11/30 20:38:08]

Looking at the json, "title" and "body" are not optional properties. You should
remove the HasKey checks.

[Seigo Nonaka, 2012/12/01 15:31:18]

Done.

+        EXTENSION_FUNCTION_VALIDATE(usage_dict->GetString(keys::kUsageTitleKey,
+                                                          &usage_entry.title));
+        EXTENSION_FUNCTION_VALIDATE(usage_dict->GetString(keys::kUsageBodyKey,
+                                                          &usage_entry.body));
+      }
+    }
+
     output->push_back(chromeos::InputMethodEngine::Candidate());
     output->back().value = candidate;
     output->back().id = id;
     output->back().label = label;
     output->back().annotation = annotation;
+    output->back().usage = usage_entry;
 
     if (candidate_dict->HasKey(keys::kCandidatesKey)) {
       ListValue* sub_list;
       EXTENSION_FUNCTION_VALIDATE(candidate_dict->GetList(keys::kCandidatesKey,
                                                           &sub_list));
       if (!ReadCandidates(sub_list, &(output->back().candidates))) {
         error_ = kErrorBadCandidateList;
         return false;
       }
     }
@@ skipping 122 matching lines @@
   EXTENSION_FUNCTION_VALIDATE(args_->GetBoolean(1, &handled));
 
   InputImeEventRouter::GetInstance()->OnEventHandled(
       extension_id(), request_id_str, handled);
 
   return true;
 }
 #endif
 
 }  // namespace extensions