trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.h - Issue 319633005: Revert 275492 "ChromeOS login webui refactoring : Simplify login..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.h

Issue 319633005: Revert 275492 "ChromeOS login webui refactoring : Simplify login..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc ('k') | trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.h

===================================================================

--- trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.h (revision 275547)

+++ trunk/src/chrome/browser/chromeos/login/lock/webui_screen_locker.h (working copy)

@@ -14,7 +14,6 @@

#include "base/memory/weak_ptr.h"

#include "base/time/time.h"

#include "chrome/browser/chromeos/login/lock/screen_locker_delegate.h"

-#include "chrome/browser/chromeos/login/signin_specifics.h"

#include "chrome/browser/chromeos/login/ui/lock_window.h"

#include "chrome/browser/chromeos/login/ui/login_display.h"

#include "chrome/browser/chromeos/login/ui/webui_login_view.h"

@@ -78,13 +77,13 @@

virtual void CompleteLogin(const UserContext& user_context) OVERRIDE;

virtual base::string16 GetConnectedNetworkName() OVERRIDE;

virtual bool IsSigninInProgress() const OVERRIDE;

- virtual void Login(const UserContext& user_context,

- const SigninSpecifics& specifics) OVERRIDE;

- // virtual void LoginAsRetailModeUser() OVERRIDE;

- // virtual void LoginAsGuest() OVERRIDE;

+ virtual void Login(const UserContext& user_context) OVERRIDE;

+ virtual void LoginAsRetailModeUser() OVERRIDE;

+ virtual void LoginAsGuest() OVERRIDE;

virtual void MigrateUserData(const std::string& old_password) OVERRIDE;

- // virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;

+ virtual void LoginAsPublicAccount(const std::string& username) OVERRIDE;

virtual void OnSigninScreenReady() OVERRIDE;

+ virtual void OnUserSelected(const std::string& username) OVERRIDE;

virtual void OnStartEnterpriseEnrollment() OVERRIDE;

virtual void OnStartKioskEnableScreen() OVERRIDE;

virtual void OnStartKioskAutolaunchScreen() OVERRIDE;

@@ -93,6 +92,8 @@

virtual void ResyncUserData() 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;

// content::NotificationObserver (via WebUILoginView) implementation.

virtual void Observe(int type,