Rename IBusLookupTable to CandidateWindow, and move it to chromeos/ime.

Rename IBusLookupTable to CandidateWindow, and move the code location from dbus/ibus/ibus_lookup_table.h to chromeos/ime/candidate_window.h

Along with this rename, this patch also renames variable names from (table or lookup_table) to candidate_window.





BUG=293117
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=226452

[Hiro Komatsu, 2013-10-02 02:43:48]

ping.

[Seigo Nonaka, 2013-10-02 03:29:33]

lgtm, sorry for late response.

[commit-bot: I haz the power, 2013-10-02 06:24:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/komatsu@chromium.org/24946003/3001

[commit-bot: I haz the power, 2013-10-02 06:24:23]

Failed to apply patch for
chrome/browser/chromeos/input_method/input_method_engine_ibus.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
  Hunk #1 FAILED at 18.
  Hunk #2 succeeded at 51 (offset -1 lines).
  Hunk #3 succeeded at 226 (offset -1 lines).
  Hunk #4 succeeded at 255 (offset -1 lines).
  Hunk #5 succeeded at 298 (offset -1 lines).
  Hunk #6 succeeded at 312 (offset -1 lines).
  Hunk #7 succeeded at 341 (offset -1 lines).
  1 out of 7 hunks FAILED -- saving rejects to file
chrome/browser/chromeos/input_method/input_method_engine_ibus.cc.rej

Patch:       chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
Index: chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
index
6cc23b2c8bd82b32afb34d49b6483b3f730f7f55..601929e6f8abc0a47cf8708f9ab2d74279514355
100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.cc
@@ -18,9 +18,9 @@
 #include "chromeos/dbus/ibus/ibus_component.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
-#include "chromeos/dbus/ibus/ibus_lookup_table.h"
 #include "chromeos/dbus/ibus/ibus_property.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
+#include "chromeos/ime/candidate_window.h"
 #include "chromeos/ime/component_extension_ime_manager.h"
 #include "chromeos/ime/extension_ime_util.h"
 #include "chromeos/ime/ibus_keymap.h"
@@ -52,7 +52,7 @@ InputMethodEngineIBus::InputMethodEngineIBus()
       preedit_text_(new IBusText()),
       preedit_cursor_(0),
       component_(new IBusComponent()),
-      table_(new IBusLookupTable()),
+      candidate_window_(new input_method::CandidateWindow()),
       window_visible_(false),
       weak_ptr_factory_(this) {
 }
@@ -227,21 +227,24 @@ InputMethodEngineIBus::GetCandidateWindowProperty() const
{
 
 void InputMethodEngineIBus::SetCandidateWindowProperty(
     const CandidateWindowProperty& property) {
-  IBusLookupTable::CandidateWindowProperty ibus_property;
-  ibus_property.page_size = property.page_size;
-  ibus_property.is_cursor_visible = property.is_cursor_visible;
-  ibus_property.is_vertical = property.is_vertical;
-  ibus_property.show_window_at_composition =
+  // Type conversion from InputMethodEngine::CandidateWindowProperty to
+  // CandidateWindow::CandidateWindowProperty defined in chromeos/ime/.
+  input_method::CandidateWindow::CandidateWindowProperty dest_property;
+  dest_property.page_size = property.page_size;
+  dest_property.is_cursor_visible = property.is_cursor_visible;
+  dest_property.is_vertical = property.is_vertical;
+  dest_property.show_window_at_composition =
       property.show_window_at_composition;
-  ibus_property.cursor_position = table_->GetProperty().cursor_position;
-  table_->SetProperty(ibus_property);
+  dest_property.cursor_position =
+      candidate_window_->GetProperty().cursor_position;
+  candidate_window_->SetProperty(dest_property);
   candidate_window_property_ = property;
 
   if (active_) {
-    IBusPanelCandidateWindowHandlerInterface* candidate_window =
-      IBusBridge::Get()->GetCandidateWindowHandler();
-    if (candidate_window)
-      candidate_window->UpdateLookupTable(*table_, window_visible_);
+    IBusPanelCandidateWindowHandlerInterface* cw_handler =
+        IBusBridge::Get()->GetCandidateWindowHandler();
+    if (cw_handler)
+      cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   }
 }
 
@@ -253,10 +256,10 @@ bool InputMethodEngineIBus::SetCandidateWindowVisible(bool
visible,
   }
 
   window_visible_ = visible;
-  IBusPanelCandidateWindowHandlerInterface* candidate_window =
+  IBusPanelCandidateWindowHandlerInterface* cw_handler =
     IBusBridge::Get()->GetCandidateWindowHandler();
-  if (candidate_window)
-    candidate_window->UpdateLookupTable(*table_, window_visible_);
+  if (cw_handler)
+    cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   return true;
 }
 
@@ -296,10 +299,10 @@ bool InputMethodEngineIBus::SetCandidates(
   // TODO: Nested candidates
   candidate_ids_.clear();
   candidate_indexes_.clear();
-  table_->mutable_candidates()->clear();
+  candidate_window_->mutable_candidates()->clear();
   for (std::vector<Candidate>::const_iterator ix = candidates.begin();
        ix != candidates.end(); ++ix) {
-    IBusLookupTable::Entry entry;
+    input_method::CandidateWindow::Entry entry;
     entry.value = ix->value;
     entry.label = ix->label;
     entry.annotation = ix->annotation;
@@ -310,13 +313,13 @@ bool InputMethodEngineIBus::SetCandidates(
     candidate_indexes_[ix->id] = candidate_ids_.size();
     candidate_ids_.push_back(ix->id);
 
-    table_->mutable_candidates()->push_back(entry);
+    candidate_window_->mutable_candidates()->push_back(entry);
   }
   if (active_) {
-    IBusPanelCandidateWindowHandlerInterface* candidate_window =
+    IBusPanelCandidateWindowHandlerInterface* cw_handler =
       IBusBridge::Get()->GetCandidateWindowHandler();
-    if (candidate_window)
-      candidate_window->UpdateLookupTable(*table_, window_visible_);
+    if (cw_handler)
+      cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   }
   return true;
 }
@@ -339,11 +342,11 @@ bool InputMethodEngineIBus::SetCursorPosition(int
context_id, int candidate_id,
     return false;
   }
 
-  table_->set_cursor_position(position->second);
-  IBusPanelCandidateWindowHandlerInterface* candidate_window =
+  candidate_window_->set_cursor_position(position->second);
+  IBusPanelCandidateWindowHandlerInterface* cw_handler =
     IBusBridge::Get()->GetCandidateWindowHandler();
-  if (candidate_window)
-    candidate_window->UpdateLookupTable(*table_, window_visible_);
+  if (cw_handler)
+    cw_handler->UpdateLookupTable(*candidate_window_, window_visible_);
   return true;
 }

[Hiro Komatsu, 2013-10-02 06:42:05]

Satoru,

Please give your LGTM for chromeos/chromeos.gyp.
Thanks,

[satorux1, 2013-10-02 06:46:29]

chromeos.gyp LGTM

[commit-bot: I haz the power, 2013-10-02 09:28:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/komatsu@chromium.org/24946003/8001

[commit-bot: I haz the power, 2013-10-02 12:18:22]

Change committed as 226452