cleanup: Split ibus_controller.h into 5 headers

chrome/browser/chromeos/input_method/input_method_manager.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_manager.h"
 
 #include <algorithm>
 
 #include <glib.h>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
+#include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/accelerators/accelerator.h"
@@ skipping 117 matching lines @@
       public IBusController::Observer {
  public:
   InputMethodManagerImpl()
       : ibus_controller_(IBusController::Create()),
         should_hide_properties_(true),
         should_launch_ime_(false),
         ime_connected_(false),
         enable_auto_ime_shutdown_(true),
         shutting_down_(false),
         ibus_daemon_process_handle_(base::kNullProcessHandle),
-        util_(ibus_controller_->GetSupportedInputMethods()),
+        util_(whitelist_.GetSupportedInputMethods()),
         xkeyboard_(XKeyboard::Create(util_)),
         ignore_hotkeys_(false) {
     // Observe APP_TERMINATING to stop input method daemon gracefully.
     // We should not use APP_EXITING here since logout might be canceled by
     // JavaScript after APP_EXITING is sent (crosbug.com/11055).
     // Note that even if we fail to stop input method daemon from
     // Chrome in case of a sudden crash, we have a way to do it from an
     // upstart script. See crosbug.com/6515 and crosbug.com/6995 for
     // details.
     notification_registrar_.Add(this, content::NOTIFICATION_APP_TERMINATING,
@@ skipping 120 matching lines @@
     }
     return result;
   }
 
   virtual size_t GetNumActiveInputMethods() {
     scoped_ptr<InputMethodDescriptors> input_methods(GetActiveInputMethods());
     return input_methods->size();
   }
 
   virtual InputMethodDescriptors* GetSupportedInputMethods() {
-    return ibus_controller_->GetSupportedInputMethods();
+    return whitelist_.GetSupportedInputMethods();
   }
 
   virtual void ChangeInputMethod(const std::string& input_method_id) {
     // Changing the input method isn't guaranteed to succeed here, but we
     // should remember the last one regardless. See comments in
     // FlushImeConfig() for details.
     tentative_current_input_method_id_ = input_method_id;
 
     if (InputMethodUtil::IsKeyboardLayout(input_method_id)
 #if !defined(USE_AURA)
@@ skipping 1209 matching lines @@
   // those created by extension.
   std::map<std::string, InputMethodDescriptor> extra_input_method_ids_;
 
 #if !defined(USE_AURA)
   // A muitlmap from input method id to input method specific hotkey
   // information. e.g. "mozc-jp" to XK_ZenkakuHankaku, "mozc-jp" to XK_Henkan.
   std::multimap<std::string,
                 const InputMethodSpecificHotkeySetting*> extra_hotkeys_;
 #endif
 
+  InputMethodWhitelist whitelist_;
+
   // An object which provides miscellaneous input method utility functions. Note
   // that |util_| is required to initialize |xkeyboard_|.
   InputMethodUtil util_;
 
   // An object for switching XKB layouts and keyboard status like caps lock and
   // auto-repeat interval.
   scoped_ptr<XKeyboard> xkeyboard_;
 
 #if !defined(USE_AURA)
   // An object which detects Control+space and Shift+Alt key presses.
   HotkeyManager hotkey_manager_;
 #endif
 
   // true when DisableHotkeys() is called to temporarily disable IME hotkeys.
   // EnableHotkeys() resets the flag to the default value, false.
   bool ignore_hotkeys_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 // static
 InputMethodManager* InputMethodManager::GetInstance() {
   return InputMethodManagerImpl::GetInstance();
 }
 
 }  // namespace input_method
 }  // namespace chromeos