summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 20:14:44 +0000
committernkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 20:14:44 +0000
commit01e663cc4f592625d831b31c6ed3467b72e07f16 (patch)
tree80f45013ce5fc6b2177357687fe1e29c247af0f8
parent579dee4d267188e2dba224595fc09e4abf0e3a0b (diff)
downloadchromium_src-01e663cc4f592625d831b31c6ed3467b72e07f16.zip
chromium_src-01e663cc4f592625d831b31c6ed3467b72e07f16.tar.gz
chromium_src-01e663cc4f592625d831b31c6ed3467b72e07f16.tar.bz2
Merge 84407 - Close throbber when the browser was launched.
BUG=chromium-os:14939 TEST=manual Review URL: http://codereview.chromium.org/6927042 TBR=altimofeev@chromium.org Review URL: http://codereview.chromium.org/6955005 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84491 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller.cc2
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller_browsertest.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index f562c23..5ef8b56 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -364,6 +364,7 @@ void ExistingUserController::OnProfilePrepared(Profile* profile) {
// Delay deletion as we're on the stack.
host_->OnSessionStart();
}
+ login_display_->OnFadeOut();
}
void ExistingUserController::OnOffTheRecordLoginSuccess() {
@@ -441,7 +442,6 @@ void ExistingUserController::ActivateWizard(const std::string& screen_name) {
if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
start_url = guest_mode_url_;
host_->StartWizard(screen_name, start_url);
- login_display_->OnFadeOut();
}
gfx::NativeWindow ExistingUserController::GetNativeWindow() const {
diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
index 7f242b4..a73913d 100644
--- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc
@@ -83,9 +83,10 @@ class MockLoginPerformerDelegate : public LoginPerformer::Delegate {
const std::string&,
const GaiaAuthConsumer::ClientLoginResult&,
bool) {
+ WizardController::MarkDeviceRegistered();
LoginPerformer* login_performer = controller_->login_performer_.release();
login_performer = NULL;
- controller_->ActivateWizard(WizardController::kUserImageScreenName);
+ controller_->OnProfilePrepared(NULL);
}
MOCK_METHOD1(OnLoginFailure, void(const LoginFailure&));