Revert of ChromeOS: "Add New User" screen should enable all hardware keyboards.

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h

 // Copyright (c) 2013 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 10 matching lines @@
 #include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/signin/screenlock_bridge.h"
 #include "chrome/browser/ui/webui/chromeos/login/base_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/touch_view_controller_delegate.h"
 #include "chromeos/ime/ime_keyboard.h"
-#include "chromeos/ime/input_method_manager.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_ui.h"
 #include "net/base/net_errors.h"
 #include "ui/events/event_handler.h"
 
 namespace base {
 class DictionaryValue;
@@ skipping 165 matching lines @@
 
 // A class that handles the WebUI hooks in sign-in screen in OobeDisplay
 // and LoginDisplay.
 class SigninScreenHandler
     : public BaseScreenHandler,
       public LoginDisplayWebUIHandler,
       public content::NotificationObserver,
       public ScreenlockBridge::LockHandler,
       public NetworkStateInformer::NetworkStateInformerObserver,
       public input_method::ImeKeyboard::Observer,
-      public TouchViewControllerDelegate::Observer,
-      public OobeUI::Observer {
+      public TouchViewControllerDelegate::Observer {
  public:
   SigninScreenHandler(
       const scoped_refptr<NetworkStateInformer>& network_state_informer,
       ErrorScreenActor* error_screen_actor,
       CoreOobeActor* core_oobe_actor,
       GaiaScreenHandler* gaia_screen_handler);
   virtual ~SigninScreenHandler();
 
   // Shows the sign in screen.
   void Show(const LoginScreenContext& context);
@@ skipping 12 matching lines @@
   virtual void UpdateState(ErrorScreenActor::ErrorReason reason) OVERRIDE;
 
   // Required Local State preferences.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
   void set_kiosk_enable_flow_aborted_callback_for_test(
       const base::Closure& callback) {
     kiosk_enable_flow_aborted_callback_for_test_ = callback;
   }
 
-  // OobeUI::Observer implemetation.
-  virtual void OnCurrentScreenChanged(OobeUI::Screen current_screen,
-                                      OobeUI::Screen new_screen) OVERRIDE;
-
-  // Returns least used user login input method.
-  std::string GetUserLRUInputMethod(const std::string& username) const;
-
-  void SetFocusPODCallbackForTesting(base::Closure callback);
-
  private:
   enum UIState {
     UI_STATE_UNKNOWN = 0,
     UI_STATE_GAIA_SIGNIN,
     UI_STATE_ACCOUNT_PICKER,
   };
 
   friend class GaiaScreenHandler;
   friend class ReportDnsCacheClearedOnUIThread;
   friend class SupervisedUserCreationScreenHandler;
@@ skipping 156 matching lines @@
   bool IsSigninScreenHiddenByError() const;
 
   // Returns true if guest signin is allowed.
   bool IsGuestSigninAllowed() const;
 
   // Returns true if offline login is allowed.
   bool IsOfflineLoginAllowed() const;
 
   bool ShouldLoadGaia() const;
 
-  // Update current input method (namely keyboard layout) in the given IME state
-  // to LRU by this user.
-  void SetUserInputMethod(const std::string& username,
-                          input_method::InputMethodManager::State* ime_state);
+  // Update current input method (namely keyboard layout) to LRU by this user.
+  void SetUserInputMethod(const std::string& username);
 
   // Invoked when auto enrollment check progresses to decide whether to
   // continue kiosk enable flow. Kiosk enable flow is resumed when
   // |state| indicates that enrollment is not applicable.
   void ContinueKioskEnableFlow(policy::AutoEnrollmentState state);
 
   // Shows signin.
   void OnShowAddUser();
 
   GaiaScreenHandler::FrameState FrameState() const;
   net::Error FrameError() const;
 
   // input_method::ImeKeyboard::Observer implementation:
   virtual void OnCapsLockChanged(bool enabled) OVERRIDE;
 
-  // Returns OobeUI object of NULL.
-  OobeUI* GetOobeUI() const;
-
   // Current UI state of the signin screen.
   UIState ui_state_;
 
   // A delegate that glues this handler with backend LoginDisplay.
   SigninScreenHandlerDelegate* delegate_;
 
   // A delegate used to get gfx::NativeWindow.
   NativeWindowDelegate* native_window_delegate_;
 
   // Whether screen should be shown right after initialization.
@@ skipping 42 matching lines @@
 
   // Helper that retrieves the authenticated user's e-mail address.
   scoped_ptr<AuthenticatedUserEmailRetriever> email_retriever_;
 
   // Maximized mode controller delegate.
   scoped_ptr<TouchViewControllerDelegate> max_mode_delegate_;
 
   // Whether consumer management enrollment is in progress.
   bool is_enrolling_consumer_management_;
 
-  // Input Method Engine state used at signin screen.
-  scoped_refptr<input_method::InputMethodManager::State> ime_state_;
-
-  // This callback captures "focusPod finished" event for tests.
-  base::Closure test_focus_pod_callback_;
-
   base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_