Fix unexpected auxiliary text appearance.

chrome/browser/chromeos/input_method/input_method_engine_ibus.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/input_method_engine_ibus.h"
 
 #include <map>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 34 matching lines @@
       context_id_(0),
       next_context_id_(1),
       current_object_path_(0),
       aux_text_(new ibus::IBusText()),
       aux_text_visible_(false),
       observer_(NULL),
       preedit_text_(new ibus::IBusText()),
       preedit_cursor_(0),
       component_(new ibus::IBusComponent()),
       table_(new ibus::IBusLookupTable()),
-      table_visible_(false),
+      window_visible_(false),
       weak_ptr_factory_(this) {
 }
 
 InputMethodEngineIBus::~InputMethodEngineIBus() {
   GetCurrentService()->UnsetEngine();
   input_method::GetInputMethodManager()->RemoveInputMethodExtension(ibus_id_);
 }
 
 void InputMethodEngineIBus::Initialize(
     InputMethodEngine::Observer* observer,
@@ skipping 136 matching lines @@
   return true;
 }
 
 bool InputMethodEngineIBus::SetCandidateWindowVisible(bool visible,
                                                       std::string* error) {
   if (!active_) {
     *error = kErrorNotActive;
     return false;
   }
 
-  table_visible_ = visible;
-  GetCurrentService()->UpdateLookupTable(*table_.get(), table_visible_);
+  window_visible_ = visible;
+  GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
   return true;
 }
 
 void InputMethodEngineIBus::SetCandidateWindowCursorVisible(bool visible) {
-  if (!active_)
-    return;
   table_->set_is_cursor_visible(visible);
-  GetCurrentService()->UpdateLookupTable(*table_.get(), table_visible_);
+  if (active_)
+    GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
 }
 
 void InputMethodEngineIBus::SetCandidateWindowVertical(bool vertical) {
-  if (!active_)
-    return;
   table_->set_orientation(
       vertical ? ibus::IBusLookupTable::IBUS_LOOKUP_TABLE_ORIENTATION_VERTICAL :
       ibus::IBusLookupTable::IBUS_LOOKUP_TABLE_ORIENTATION_HORIZONTAL);
-  GetCurrentService()->UpdateLookupTable(*table_.get(), table_visible_);
+  if (active_)
+    GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
 }
 
 void InputMethodEngineIBus::SetCandidateWindowPageSize(int size) {
-  if (!active_)
-    return;
   table_->set_page_size(size);
-  GetCurrentService()->UpdateLookupTable(*table_.get(), table_visible_);
+  if (active_)
+    GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
 }
 
 void InputMethodEngineIBus::SetCandidateWindowAuxText(const char* text) {
-  if (!active_)
-    return;
   aux_text_->set_text(text);
-  GetCurrentService()->UpdateAuxiliaryText(*aux_text_.get(), aux_text_visible_);
+  if (active_) {
+    // Should not show auxiliary text if the whole window visibility is false.
+    GetCurrentService()->UpdateAuxiliaryText(
+        *aux_text_.get(),
+        window_visible_ && aux_text_visible_);
+  }
 }
 
 void InputMethodEngineIBus::SetCandidateWindowAuxTextVisible(bool visible) {
-  if (!active_)
-    return;
   aux_text_visible_ = visible;
-  GetCurrentService()->UpdateAuxiliaryText(*aux_text_.get(), aux_text_visible_);
+  if (active_) {
+    // Should not show auxiliary text if the whole window visibility is false.
+    GetCurrentService()->UpdateAuxiliaryText(
+        *aux_text_.get(),
+        window_visible_ && aux_text_visible_);
+  }
 }
 
 bool InputMethodEngineIBus::SetCandidates(
     int context_id,
     const std::vector<Candidate>& candidates,
     std::string* error) {
   if (!active_) {
     *error = kErrorNotActive;
     return false;
   }
@@ skipping 14 matching lines @@
     entry.annotation = ix->annotation;
     entry.description_title = ix->usage.title;
     entry.description_body = ix->usage.body;
 
     // Store a mapping from the user defined ID to the candidate index.
     candidate_indexes_[ix->id] = candidate_ids_.size();
     candidate_ids_.push_back(ix->id);
 
     table_->mutable_candidates()->push_back(entry);
   }
-  GetCurrentService()->UpdateLookupTable(*table_.get(), table_visible_);
+  GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
   return true;
 }
 
 bool InputMethodEngineIBus::SetCursorPosition(int context_id, int candidate_id,
                                               std::string* error) {
   if (!active_) {
     *error = kErrorNotActive;
     return false;
   }
   if (context_id != context_id_ || context_id_ == -1) {
     *error = kErrorWrongContext;
     return false;
   }
 
   std::map<int, int>::const_iterator position =
       candidate_indexes_.find(candidate_id);
   if (position == candidate_indexes_.end()) {
     *error = kCandidateNotFound;
     return false;
   }
 
   table_->set_cursor_position(position->second);
-  GetCurrentService()->UpdateLookupTable(*table_.get(), table_visible_);
+  GetCurrentService()->UpdateLookupTable(*table_.get(), window_visible_);
   return true;
 }
 
 bool InputMethodEngineIBus::SetMenuItems(const std::vector<MenuItem>& items) {
   if (!active_)
     return false;
 
   ibus::IBusPropertyList properties;
   for (std::vector<MenuItem>::const_iterator item = items.begin();
        item != items.end(); ++item) {
@@ skipping 252 matching lines @@
   DBusThreadManager::Get()->RemoveIBusEngineService(object_path_);
 
   current_object_path_++;
   object_path_ = dbus::ObjectPath(kObjectPathPrefix +
                                   base::IntToString(current_object_path_));
   GetCurrentService()->SetEngine(this);
   sender.Run(object_path_);
 }
 
 }  // namespace chromeos