summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 15:47:54 +0000
committeraltimofeev@chromium.org <altimofeev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 15:47:54 +0000
commit24b8bce0f1ee11a08cf1f9d6c8184b987e64eb0a (patch)
tree3844d21f3456aaa3d2f6c611d11a2665c564d764
parenteb5a70cfebc5e29669511add506e74bf38000cd1 (diff)
downloadchromium_src-24b8bce0f1ee11a08cf1f9d6c8184b987e64eb0a.zip
chromium_src-24b8bce0f1ee11a08cf1f9d6c8184b987e64eb0a.tar.gz
chromium_src-24b8bce0f1ee11a08cf1f9d6c8184b987e64eb0a.tar.bz2
Pass starting url when account is created.
BUG=chromium-os:12624 TEST=manual Review URL: http://codereview.chromium.org/6624018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76918 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/chromeos/login/existing_user_controller.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index d02e7c8..f0c3d41 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -442,10 +442,11 @@ void ExistingUserController::ActivateWizard(const std::string& screen_name) {
controller->OwnBackground(background_window_, background_view_);
background_window_ = NULL;
- controller->Init(screen_name, background_bounds_);
if (chromeos::UserManager::Get()->IsLoggedInAsGuest())
controller->set_start_url(guest_mode_url_);
+ controller->Init(screen_name, background_bounds_);
+
login_display_->OnFadeOut();
delete_timer_.Start(base::TimeDelta::FromSeconds(1), this,