Make almost all public functions in XKeyboard pure virtual

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 "unicode/uloc.h"
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"

[mazda, 2012/01/20 02:31:43]

#include "base/memory/scoped_ptr.h"

[Yusuke Sato, 2012/01/20 03:33:48]

Done.

 #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/hotkey_manager.h"
 #include "chrome/browser/chromeos/input_method/input_method_util.h"
 #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
@@ skipping 115 matching lines @@
  public:
   InputMethodManagerImpl()
       : ibus_controller_(IBusController::Create()),
         should_launch_ime_(false),
         ime_connected_(false),
         defer_ime_startup_(false),
         enable_auto_ime_shutdown_(true),
         shutting_down_(false),
         ibus_daemon_process_handle_(base::kNullProcessHandle),
         util_(ibus_controller_->GetSupportedInputMethods()),
-        xkeyboard_(util_) {
+        xkeyboard_(XKeyboard::Create(util_)) {
     // 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,
                                 content::NotificationService::AllSources());
 
@@ skipping 354 matching lines @@
   virtual void ClearAllVirtualKeyboardPreferences() {
     virtual_keyboard_selector_.ClearAllUserPreferences();
     UpdateVirtualKeyboardUI();
   }
 
   virtual InputMethodUtil* GetInputMethodUtil() {
     return &util_;
   }
 
   virtual XKeyboard* GetXKeyboard() {
-    return &xkeyboard_;
+    return xkeyboard_.get();
   }
 
   virtual HotkeyManager* GetHotkeyManager() {
     return &hotkey_manager_;
   }
 
   virtual void HotkeyPressed(HotkeyManager* manager, int event_id) {
     const HotkeyEvent event = HotkeyEvent(event_id);
     switch (event) {
       case kPreviousInputMethod:
@@ skipping 407 matching lines @@
   // descriptor.  This function updates states like current_input_method_
   // and notifies observers about the change (that will update the
   // preferences), hence this function should always be used even if you
   // just need to change the current keyboard layout.
   void ChangeCurrentInputMethod(const InputMethodDescriptor& new_input_method) {
     if (current_input_method_.id() != new_input_method.id()) {
       previous_input_method_ = current_input_method_;
       current_input_method_ = new_input_method;
 
       // Change the keyboard layout to a preferred layout for the input method.
-      if (!xkeyboard_.SetCurrentKeyboardLayoutByName(
+      if (!xkeyboard_->SetCurrentKeyboardLayoutByName(
               current_input_method_.keyboard_layout())) {
         LOG(ERROR) << "Failed to change keyboard layout to "
                    << current_input_method_.keyboard_layout();
       }
 
       // Save the input method names to the Pref.
       if (!UpdateInputMethodPreference(&post_login_preference_observers_)) {
         // When both pre- and post-login observers are available, only notifies
         // the latter one.
         UpdateInputMethodPreference(&pre_login_preference_observers_);
@@ skipping 444 matching lines @@
   // information. e.g. "mozc-jp" to XK_ZenkakuHankaku, "mozc-jp" to XK_Henkan.
   std::multimap<std::string,
                 const InputMethodSpecificHotkeySetting*> extra_hotkeys_;
 
   // 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.
-  XKeyboard xkeyboard_;
+  scoped_ptr<XKeyboard> xkeyboard_;
 
   // An object which detects Control+space and Shift+Alt key presses.
   HotkeyManager hotkey_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
 };
 
 // static
 InputMethodManager* InputMethodManager::GetInstance() {
   return InputMethodManagerImpl::GetInstance();
 }
 
 }  // namespace input_method
 }  // namespace chromeos