Revert 275550 "Revert 275046 "ChromeOS login webui refactoring: ..."

trunk/src/chrome/browser/chromeos/login/ui/webui_login_display.h

 // Copyright 2014 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_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
-#include "base/timer/timer.h"
 #include "chrome/browser/chromeos/login/screens/gaia_screen.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
 #include "chrome/browser/chromeos/login/ui/login_display.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "ui/views/widget/widget.h"
 #include "ui/wm/core/user_activity_observer.h"
 
 namespace chromeos {
@@ skipping 47 matching lines @@
   virtual void ShowKioskEnableScreen() OVERRIDE;
   virtual void ShowKioskAutolaunchScreen() OVERRIDE;
   virtual void ShowWrongHWIDScreen() OVERRIDE;
   virtual void SetWebUIHandler(
       LoginDisplayWebUIHandler* webui_handler) OVERRIDE;
   virtual void ShowSigninScreenForCreds(const std::string& username,
                                         const std::string& password);
   virtual const UserList& GetUsers() const OVERRIDE;
   virtual bool IsShowGuest() const OVERRIDE;
   virtual bool IsShowUsers() const OVERRIDE;
-  virtual bool IsShowNewUser() const OVERRIDE;
   virtual bool IsSigninInProgress() const OVERRIDE;
   virtual bool IsUserSigninCompleted() const OVERRIDE;
   virtual void SetDisplayEmail(const std::string& email) OVERRIDE;
   virtual void Signout() OVERRIDE;
   virtual void LoginAsKioskApp(const std::string& app_id,
                                bool diagnostic_mode) OVERRIDE;
+  virtual void HandleGetUsers() OVERRIDE;
+  virtual void SetAuthType(
+      const std::string& username,
+      ScreenlockBridge::LockHandler::AuthType auth_type) OVERRIDE;
+  virtual ScreenlockBridge::LockHandler::AuthType GetAuthType(
+      const std::string& username) const OVERRIDE;
 
   // wm::UserActivityDetector implementation:
   virtual void OnUserActivity(const ui::Event* event) OVERRIDE;
 
  private:
-  void StartPasswordClearTimer();
-  void OnPasswordClearTimerExpired();
 
   // Whether to show guest login.
   bool show_guest_;
 
   // Weather to show the user pods or a GAIA sign in.
   // Public sessions are always shown.
   bool show_users_;
 
   // Whether to show add new user.
   bool show_new_user_;
 
-  // Timer for measuring idle state duration before password clear.
-  base::OneShotTimer<WebUILoginDisplay> password_clear_timer_;
-
   // Reference to the WebUI handling layer for the login screen
   LoginDisplayWebUIHandler* webui_handler_;
 
   scoped_ptr<GaiaScreen> gaia_screen_;
   scoped_ptr<UserSelectionScreen> user_selection_screen_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUILoginDisplay);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_UI_WEBUI_LOGIN_DISPLAY_H_