diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 15:59:18 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-30 15:59:18 +0000 |
| commit | 7e96094572afe3ce10f8f0d4bed90d8da5dfb393 (patch) | |
| tree | fa0f38d2ea76cf80059d09099e917e2512bde659 /chrome | |
| parent | 201439b2b52557a8c8080cd4f2f5e020c512f62a (diff) | |
| download | chromium_src-7e96094572afe3ce10f8f0d4bed90d8da5dfb393.zip chromium_src-7e96094572afe3ce10f8f0d4bed90d8da5dfb393.tar.gz chromium_src-7e96094572afe3ce10f8f0d4bed90d8da5dfb393.tar.bz2 | |
[cros] Proper implementation for Guest mode on legacy login screen.
Fixes Guest mode for test images.
BUG=chromium-os:6626
TEST=On test image "Skip sign-in ang go incognito" opens proper Guest mode.
Review URL: http://codereview.chromium.org/3525007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61067 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/chromeos/login/login_screen.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/login_screen.h | 2 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/login_screen_browsertest.cc | 9 |
3 files changed, 4 insertions, 9 deletions
diff --git a/chrome/browser/chromeos/login/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc index 6f34d0e..98dd4b6 100644 --- a/chrome/browser/chromeos/login/login_screen.cc +++ b/chrome/browser/chromeos/login/login_screen.cc @@ -102,7 +102,7 @@ void LoginScreen::OnLoginSuccess(const std::string& username, } void LoginScreen::OnOffTheRecordLoginSuccess() { - delegate()->GetObserver(this)->OnExit(ScreenObserver::LOGIN_GUEST_SELECTED); + LoginUtils::Get()->CompleteOffTheRecordLogin(start_url_); } void LoginScreen::OnHelpLinkActivated() { diff --git a/chrome/browser/chromeos/login/login_screen.h b/chrome/browser/chromeos/login/login_screen.h index 59bcd0e..ae1cb91 100644 --- a/chrome/browser/chromeos/login/login_screen.h +++ b/chrome/browser/chromeos/login/login_screen.h @@ -19,6 +19,8 @@ namespace chromeos { class MessageBubble; +// This screen is obsolete, used only on test images. http://crosbug.com/7214 +// TODO(nkostylev): Use ExistingUserController sign in screen for test images. class LoginScreen : public ViewScreen<NewUserView>, public NewUserView::Delegate, public LoginStatusConsumer, diff --git a/chrome/browser/chromeos/login/login_screen_browsertest.cc b/chrome/browser/chromeos/login/login_screen_browsertest.cc index 35425e3..5d97071 100644 --- a/chrome/browser/chromeos/login/login_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/login_screen_browsertest.cc @@ -129,19 +129,12 @@ IN_PROC_BROWSER_TEST_F(LoginScreenTest, IncognitoLogin) { scoped_ptr<MockScreenObserver> mock_screen_observer( new MockScreenObserver()); - EXPECT_CALL(*mock_screen_observer, - OnExit(ScreenObserver::LOGIN_GUEST_SELECTED)) - .WillOnce(InvokeWithoutArgs(Quit)); - controller()->set_observer(mock_screen_observer.get()); NewUserView* login = controller()->GetLoginScreen()->view(); - bool old_state = MessageLoop::current()->NestableTasksAllowed(); - MessageLoop::current()->SetNestableTasksAllowed(true); login->LinkActivated(login->browse_without_signin_link_, 0); - MessageLoop::current()->Run(); - MessageLoop::current()->SetNestableTasksAllowed(old_state); controller()->set_observer(NULL); + Quit(); } } // namespace chromeos |