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

Unified Diff: chrome/browser/chromeos/login/screen_lock_view.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: Merged with trunk. 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/screen_lock_view.cc
diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc
index 69a270b875f809d624d19f9cceb4749c9dfeb287..0aee6da83995625c9ed14c59ef068bfbaf484817 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.cc
+++ b/chrome/browser/chromeos/login/screen_lock_view.cc
@@ -63,7 +63,8 @@ ScreenLockView::ScreenLockView(ScreenLocker* screen_locker)
password_field_(NULL),
screen_locker_(screen_locker),
main_(NULL),
- username_(NULL) {
+ username_(NULL),
+ throbber_widget_(NULL) {
oshima 2010/12/09 21:52:10 looks like this is not used?
altimofeev 2010/12/10 16:37:40 Exactly. Removed.
DCHECK(screen_locker_);
}
@@ -160,11 +161,16 @@ gfx::Rect ScreenLockView::GetPasswordBoundsRelativeTo(const views::View* view) {
return gfx::Rect(p, size());
}
+views::Widget* ScreenLockView::GetWidgetForThrobber() {
+ if (!password_field_)
+ return NULL;
+ return password_field_->GetWidget();
oshima 2010/12/09 21:52:10 or just return password_field_ ? ... : NULL;
altimofeev 2010/12/10 16:37:40 Done.
+}
+
void ScreenLockView::SetEnabled(bool enabled) {
views::View::SetEnabled(enabled);
if (!enabled) {
- user_view_->StartThrobber();
// TODO(oshima): Re-enabling does not move the focus to the view
// that had a focus (issue http://crbug.com/43131).
// Clear focus on the textfield so that re-enabling can set focus
@@ -173,8 +179,6 @@ void ScreenLockView::SetEnabled(bool enabled) {
// associated Widget yet.
if (password_field_->GetFocusManager())
password_field_->GetFocusManager()->ClearFocus();
- } else {
- user_view_->StopThrobber();
}
password_field_->SetEnabled(enabled);
}
@@ -213,4 +217,5 @@ void ScreenLockView::ViewHierarchyChanged(bool is_add,
if (is_add && this == child)
WizardAccessibilityHelper::GetInstance()->MaybeEnableAccessibility(this);
}
+
} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698