Merge IBusContorllerBase into IBusControllerImpl.

chrome/browser/chromeos/input_method/ibus_controller_impl.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/ibus_controller_impl.h"
 
 #include <algorithm>  // for std::reverse.
 #include <cstdio>
 #include <cstring>  // for std::strcmp.
 #include <set>
@@ skipping 194 matching lines @@
     return false;
   }
 
   IBusEngineHandlerInterface* engine = IBusBridge::Get()->GetEngineHandler();
   if (engine)
     engine->PropertyActivate(key,
                              static_cast<ibus::IBusPropertyState>(is_radio));
   return true;
 }
 
+void IBusControllerImpl::AddObserver(Observer* observer) {
+  observers_.AddObserver(observer);
+}
+
+void IBusControllerImpl::RemoveObserver(Observer* observer) {
+  observers_.RemoveObserver(observer);
+}
+
+const InputMethodPropertyList&
+IBusControllerImpl::GetCurrentProperties() const {
+  return current_property_list_;
+}
+
+void IBusControllerImpl::ClearProperties() {
+  current_property_list_.clear();
+}
+
 void IBusControllerImpl::RegisterProperties(
     const IBusPropertyList& ibus_prop_list) {
   current_property_list_.clear();
   if (!FlattenPropertyList(ibus_prop_list, &current_property_list_))
     current_property_list_.clear(); // Clear properties on errors.
   FOR_EACH_OBSERVER(IBusController::Observer, observers_, PropertyChanged());
 }
 
 void IBusControllerImpl::UpdateProperty(const IBusProperty& ibus_prop) {
   InputMethodPropertyList prop_list;  // our representation.
@@ skipping 14 matching lines @@
 
 // static
 bool IBusControllerImpl::FindAndUpdatePropertyForTesting(
     const chromeos::input_method::InputMethodProperty& new_prop,
     chromeos::input_method::InputMethodPropertyList* prop_list) {
   return FindAndUpdateProperty(new_prop, prop_list);
 }
 
 }  // namespace input_method
 }  // namespace chromeos