Rename InputMethodManager::current_input_method() to InputMethodManager::GetCurrentInputMethod().

chrome/browser/chromeos/login/screen_locker.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/login/screen_locker.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 110 matching lines @@
   // since they are not necessary to input a login password. Users are still
   // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak,
   // French).
   void SetupInputMethodsForScreenLocker() {
     if (// The LockScreen function is also called when the OS is suspended, and
         // in that case |saved_active_input_method_list_| might be non-empty.
         saved_active_input_method_list_.empty()) {
       chromeos::input_method::InputMethodManager* manager =
           chromeos::input_method::InputMethodManager::GetInstance();
 
-      saved_previous_input_method_id_ = manager->previous_input_method().id();
-      saved_current_input_method_id_ = manager->current_input_method().id();
+      saved_previous_input_method_id_ = manager->GetPreviousInputMethod().id();
+      saved_current_input_method_id_ = manager->GetCurrentInputMethod().id();
       scoped_ptr<chromeos::input_method::InputMethodDescriptors>
           active_input_method_list(manager->GetActiveInputMethods());
 
       const std::string hardware_keyboard_id =
           manager->GetInputMethodUtil()->GetHardwareInputMethodId();
       // We'll add the hardware keyboard if it's not included in
       // |active_input_method_list| so that the user can always use the hardware
       // keyboard on the screen locker.
       bool should_add_hardware_keyboard = true;
 
@@ skipping 296 matching lines @@
   bool state = true;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
       content::Source<ScreenLocker>(this),
       content::Details<bool>(&state));
   DBusThreadManager::Get()->GetPowerManagerClient()->
       NotifyScreenLockCompleted();
 }
 
 }  // namespace chromeos