Clean UP: Remove IBusClientImpl from ui/base/ime/*

chrome/browser/chromeos/input_method/ibus_ui_controller.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_ui_controller.h"
 
 #if defined(HAVE_IBUS)
 #include <ibus.h>
 #endif
 
 #include <sstream>
 
 #include "ash/shell.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/input_method/input_method_descriptor.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "third_party/mozc/session/candidates_lite.pb.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
-#include "ui/base/ime/ibus_client_impl.h"
 #include "ui/base/ime/input_method_ibus.h"
 
 namespace chromeos {
 namespace input_method {
 namespace {
 
 bool IsActive(const std::string& input_method_id,
               const InputMethodDescriptors* descriptors) {
   for (size_t i = 0; i < descriptors->size(); ++i) {
     if (descriptors->at(i).id() == input_method_id) {
@@ skipping 240 matching lines @@
     observers_.AddObserver(observer);
   }
 
   // IBusUiController override.
   virtual void RemoveObserver(Observer* observer) OVERRIDE {
     observers_.RemoveObserver(observer);
   }
 
  private:
   // A class for customizing the behavior of ui::InputMethodIBus for Chrome OS.
-  class IBusChromeOSClientImpl : public ui::internal::IBusClientImpl {
+  class IBusChromeOSClientImpl : public ui::internal::IBusClient {
    public:
     explicit IBusChromeOSClientImpl(IBusUiControllerImpl* ui)
         : ui_(ui) {
     }
 
     // ui::IBusClient override.
     virtual InputMethodType GetInputMethodType() OVERRIDE {
       const std::string current_input_method_id = GetCurrentInputMethodId();
       return InputMethodUtil::IsKeyboardLayout(current_input_method_id) ?
           INPUT_METHOD_XKB_LAYOUT : INPUT_METHOD_NORMAL;
@@ skipping 437 matching lines @@
 IBusUiController::~IBusUiController() {
 }
 
 bool IsActiveForTesting(const std::string& input_method_id,
                         const InputMethodDescriptors* descriptors) {
   return IsActive(input_method_id, descriptors);
 }
 
 }  // namespace input_method
 }  // namespace chromeos