Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(512)

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.cc

Issue 5709001: Place the spinner in the right corner of the controls window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/chrome/browser/chromeos/login
Patch Set: cpplist + remove debug Created 10 years 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
Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index 9718534e801e930ef988fbfb8f3d6144019b9299..9452ddf00b41cad5c9786cc258a95bcfdac4833a 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -214,14 +214,11 @@ void ExistingUserController::LoginNewUser(const std::string& username,
DCHECK(new_user->is_new_user());
if (!new_user->is_new_user())
return;
- NewUserView* new_user_view = new_user->new_user_view();
- new_user_view->SetUsername(username);
if (password.empty())
return;
- new_user_view->SetPassword(password);
- new_user_view->Login();
+ new_user->OnLogin(username, password);
}
void ExistingUserController::SelectNewUser() {
@@ -346,6 +343,12 @@ void ExistingUserController::OnUserSelected(UserController* source) {
}
void ExistingUserController::ActivateWizard(const std::string& screen_name) {
+ // Stop throbbers now to prevent throbbers be visible under the newly created
+ // windows.
+ for (size_t i = 0; i < controllers_.size(); ++i) {
+ controllers_[i]->StopThrobber();
+ }
+
// WizardController takes care of deleting itself when done.
WizardController* controller = new WizardController();
@@ -361,6 +364,7 @@ void ExistingUserController::ActivateWizard(const std::string& screen_name) {
// is doing an animation with our windows.
DCHECK(!delete_scheduled_instance_);
delete_scheduled_instance_ = this;
+
delete_timer_.Start(base::TimeDelta::FromSeconds(1), this,
&ExistingUserController::Delete);
}
@@ -469,7 +473,8 @@ void ExistingUserController::ShowError(int error_id,
// For now just ignore it because error_text contains all required information
// for end users, developers can see details string in Chrome logs.
- gfx::Rect bounds = controllers_[selected_view_index_]->GetScreenBounds();
+ gfx::Rect bounds =
+ controllers_[selected_view_index_]->GetMainInputScreenBounds();
BubbleBorder::ArrowLocation arrow;
if (controllers_[selected_view_index_]->is_new_user()) {
arrow = BubbleBorder::LEFT_TOP;
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/existing_user_view.h » ('j') | chrome/browser/chromeos/login/existing_user_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698