Revert 287581 "Allow recommended locales to be set for public se..."

trunk/src/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 76 matching lines @@
   virtual void ShowGaiaPasswordChanged(const std::string& username) = 0;
   virtual void ShowSigninUI(const std::string& email) = 0;
   virtual void ShowPasswordChangedDialog(bool show_password_error) = 0;
   // Show sign-in screen for the given credentials.
   virtual void ShowSigninScreenForCreds(const std::string& username,
                                         const std::string& password) = 0;
   virtual void LoadUsers(const base::ListValue& users_list,
                          bool show_guest) = 0;
   virtual void SetPublicSessionDisplayName(const std::string& user_id,
                                            const std::string& display_name) = 0;
-  virtual void SetPublicSessionLocales(const std::string& user_id,
-                                       scoped_ptr<base::ListValue> locales,
-                                       const std::string& default_locale,
-                                       bool multipleRecommendedLocales) = 0;
 
  protected:
   virtual ~LoginDisplayWebUIHandler() {}
 };
 
 // An interface for SigninScreenHandler to call WebUILoginDisplay.
 class SigninScreenHandlerDelegate {
  public:
   // --------------- Password change flow methods.
   // Cancels current password changed flow.
@@ skipping 182 matching lines @@
   virtual void ShowSigninUI(const std::string& email) OVERRIDE;
   virtual void ShowPasswordChangedDialog(bool show_password_error) OVERRIDE;
   virtual void ShowErrorScreen(LoginDisplay::SigninError error_id) OVERRIDE;
   virtual void ShowSigninScreenForCreds(const std::string& username,
                                         const std::string& password) OVERRIDE;
   virtual void LoadUsers(const base::ListValue& users_list,
                          bool show_guest) OVERRIDE;
   virtual void SetPublicSessionDisplayName(
       const std::string& user_id,
       const std::string& display_name) OVERRIDE;
-  virtual void SetPublicSessionLocales(
-      const std::string& user_id,
-      scoped_ptr<base::ListValue> locales,
-      const std::string& default_locale,
-      bool multipleRecommendedLocales) OVERRIDE;
 
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // ScreenlockBridge::LockHandler implementation:
   virtual void ShowBannerMessage(const std::string& message) OVERRIDE;
   virtual void ShowUserPodCustomIcon(const std::string& username,
                                      const gfx::Image& icon) OVERRIDE;
@@ skipping 50 matching lines @@
   void HandleShowLoadingTimeoutError();
   void HandleUpdateOfflineLogin(bool offline_login_active);
   void HandleShowSupervisedUserCreationScreen();
   void HandleFocusPod(const std::string& user_id);
   void HandleLaunchKioskApp(const std::string& app_id, bool diagnostic_mode);
   void HandleRetrieveAuthenticatedUserEmail(double attempt_token);
   void HandleGetPublicSessionKeyboardLayouts(const std::string& user_id,
                                              const std::string& locale);
   void HandleCancelConsumerManagementEnrollment();
 
-  // Sends the list of |keyboard_layouts| available for the |locale| that is
-  // currently selected for the public session identified by |user_id|.
+  // Sends the list of keyboard layouts available for the currently selected
+  // public session locale.
   void SendPublicSessionKeyboardLayouts(
       const std::string& user_id,
-      const std::string& locale,
       scoped_ptr<base::ListValue> keyboard_layouts);
 
   // Returns true iff
   // (i)   log in is restricted to some user list,
   // (ii)  all users in the restricted list are present.
   bool AllWhitelistedUsersPresent();
 
   // Cancels password changed flow - switches back to login screen.
   // Called as a callback after cookies are cleared.
   void CancelPasswordChangedFlowInternal();
@@ skipping 97 matching lines @@
   bool is_enrolling_consumer_management_;
 
   base::WeakPtrFactory<SigninScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninScreenHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_SIGNIN_SCREEN_HANDLER_H_