Enabling access notifications for login wizard

chrome/browser/chromeos/login/existing_user_view.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/existing_user_view.h"
 
 #include "app/l10n_util.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_controller.h"
+#include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "grit/generated_resources.h"
 #include "views/focus/focus_manager.h"
 #include "views/grid_layout.h"
 
 namespace chromeos {
 
 using login::kBorderSize;
 using views::GridLayout;
 
 // NativeButton that will always return focus to password field.
@@ skipping 42 matching lines @@
     else
       return views::Textfield::SkipDefaultKeyEventProcessing(e);
   }
 
  private:
   UserController* controller_;
 
   DISALLOW_COPY_AND_ASSIGN(UserEntryTextfield);
 };
 
+
 ExistingUserView::ExistingUserView(UserController* uc)
-    : accel_login_off_the_record_(
-          views::Accelerator(app::VKEY_B, false, false, true)),
-      password_field_(NULL),
+    : password_field_(NULL),
       submit_button_(NULL),
-      user_controller_(uc) {
+      user_controller_(uc),
+      accel_enable_accessibility_(
+          WizardAccessibilityHelper::GetAccelerator()) {
   AddAccelerator(accel_login_off_the_record_);
 }
 
 void ExistingUserView::RecreateFields() {
   if (password_field_ == NULL) {
     password_field_ = new UserEntryTextfield(user_controller_,
                                              views::Textfield::STYLE_PASSWORD);
     password_field_->SetFocusable(true);
     password_field_->SetController(user_controller_);
   }
@@ skipping 13 matching lines @@
                         GridLayout::USE_PREF, 0, 0);
   column_set->AddPaddingColumn(0, kBorderSize);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, 0);
   layout->AddView(password_field_);
   layout->AddView(submit_button_);
   SetLayoutManager(layout);
   layout->Layout(this);
   SchedulePaint();
+  AddAccelerator(accel_enable_accessibility_);

[Nikita (slow), 2010/09/29 14:10:23]

I'm moving this call to ctor.
RecreateFields is called on each language change that registers accelerator
mupltiple time.

Any reason why AddAccelerator shouldn't be added in ctor?

+}
+
+bool ExistingUserView::AcceleratorPressed(
+    const views::Accelerator& accelerator) {
+  if (accelerator == accel_login_off_the_record_) {
+    user_controller_->OnLoginOffTheRecord();
+    return true;
+  } else if (accelerator == accel_enable_accessibility_) {
+    WizardAccessibilityHelper::GetInstance()->EnableAccessibility(this);
+    return true;
+  }
+  return false;
+}
+
+void ExistingUserView::ViewHierarchyChanged(bool is_add,
+                                            views::View* parent,
+                                            views::View* child) {
+  if (is_add && this == child)
+    WizardAccessibilityHelper::GetInstance()->MaybeEnableAccessibility(this);
 }
 
 void ExistingUserView::FocusPasswordField() {
   if (GetFocusManager()) {
     password_field()->RequestFocus();
   }
 }
 
 void ExistingUserView::OnLocaleChanged() {
   RecreateFields();
 }
-
-
-bool ExistingUserView::AcceleratorPressed(
-    const views::Accelerator& accelerator) {
-  if (accelerator == accel_login_off_the_record_) {
-    user_controller_->OnLoginOffTheRecord();
-    return true;
-  }
-  return false;
-}
-
 }  // namespace chromeos