Support label field in ExtensinoIME API.

chrome/browser/chromeos/input_method/candidate_window.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/chromeos/input_method/candidate_window.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 123 matching lines @@
       1, views::GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
 
   // Add the view contents.
   layout->AddView(view);  // |view| is owned by |wraper|, not |layout|.
   return wrapper;
 }
 
 // Creates shortcut text from the given index and the orientation.
 string16 CreateShortcutText(int index,
-                            InputMethodLookupTable::Orientation orientation) {
+                            const InputMethodLookupTable& table) {
   // Choose the character used for the shortcut label.
   const char kShortcutCharacters[] = "1234567890ABCDEF";
   // The default character should not be used but just in case.
-  char shortcut_character = L'?';
-  // -1 to exclude the null character at the end.
-  if (index < static_cast<int>(arraysize(kShortcutCharacters) - 1))
-    shortcut_character = kShortcutCharacters[index];
+  std::string shortcut_text = " ";
+  if (table.labels.empty()) {
+    // -1 to exclude the null character at the end.
+    if (index < static_cast<int>(arraysize(kShortcutCharacters) - 1))
+      shortcut_text = std::string(1, kShortcutCharacters[index]);
+  } else {
+    if (index < static_cast<int>(table.labels.size()))
+      shortcut_text = table.labels[index];
+  }
 
-  std::string shortcut_text(1, shortcut_character);
-  if (orientation != InputMethodLookupTable::kVertical)
+  if (table.orientation != InputMethodLookupTable::kVertical)
     shortcut_text += '.';
-  return ASCIIToUTF16(shortcut_text);
+  return UTF8ToUTF16(shortcut_text);
 }
 
 // Creates the shortcut label, and returns it (never returns NULL).
 // The label text is not set in this function.
 views::Label* CreateShortcutLabel(
     InputMethodLookupTable::Orientation orientation) {
   // Create the shortcut label. The label will be owned by
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
   views::Label* shortcut_label = new views::Label;
@@ skipping 89 matching lines @@
   // |wrapped_shortcut_label|, hence it's deleted when
   // |wrapped_shortcut_label| is deleted.
   views::Label* shortcut_label = CreateShortcutLabel(lookup_table.orientation);
   scoped_ptr<views::View> wrapped_shortcut_label(
       CreateWrappedShortcutLabel(shortcut_label, lookup_table.orientation));
 
   // Compute the max width and height in shortcut labels.
   // We'll create temporary shortcut labels, and choose the largest width and
   // height.
   for (int i = 0; i < lookup_table.page_size; ++i) {
-    shortcut_label->SetText(CreateShortcutText(i, lookup_table.orientation));
+    shortcut_label->SetText(CreateShortcutText(i, lookup_table));
     gfx::Size text_size = wrapped_shortcut_label->GetPreferredSize();
     shortcut_column_width = std::max(shortcut_column_width, text_size.width());
     shortcut_column_height = std::max(shortcut_column_height,
                                       text_size.height());
   }
 
   return gfx::Size(shortcut_column_width, shortcut_column_height);
 }
 
 // Computes the page index. For instance, if the page size is 9, and the
@@ skipping 703 matching lines @@
       // Set the shortcut text.
       if (no_shortcut_mode) {
         candidate_view->SetShortcutText(string16());
       } else {
         // At this moment, we don't use labels sent from engines for UX
         // reasons. First, we want to show shortcut labels in empty rows
         // (ex. show 6, 7, 8, ... in empty rows when the number of
         // candidates is 5). Second, we want to add a period after each
         // shortcut label when the candidate window is horizontal.
         candidate_view->SetShortcutText(
-            CreateShortcutText(i, new_lookup_table.orientation));
+            CreateShortcutText(i, new_lookup_table));
       }
       // Set the candidate text.
       if (candidate_index < new_lookup_table.candidates.size() &&
           candidate_index < new_lookup_table.annotations.size()) {
         candidate_view->SetCandidateText(
             UTF8ToUTF16(new_lookup_table.candidates[candidate_index]));
         candidate_view->SetAnnotationText(
             UTF8ToUTF16(new_lookup_table.annotations[candidate_index]));
         candidate_view->SetRowEnabled(true);
 
@@ skipping 764 matching lines @@
 }
 
 // static
 CandidateWindowController*
 CandidateWindowController::CreateCandidateWindowController() {
   return new CandidateWindowControllerImpl;
 }
 
 }  // namespace input_method
 }  // namespace chromeos