[Views] Make the permissions menus on the Website Settings UI focusable by the TAB key and provuide…

chrome/browser/ui/views/website_settings/permission_selector_view.cc

 // Copyright (c) 2012 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/ui/views/website_settings/permission_selector_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "grit/generated_resources.h"
+#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/view.h"
@@ skipping 76 matching lines @@
                        PermissionMenuModel* model,
                        bool show_menu_marker);
   virtual ~PermissionMenuButton();
 
   // Overridden from views::MenuButton.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // Overridden from views::TextButton.
   virtual void SetText(const string16& text) OVERRIDE;
 
+  // Overridden from views::View.
+  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+
  private:
   // Overridden from views::MenuButtonListener.
   virtual void OnMenuButtonClicked(View* source,
                                    const gfx::Point& point) OVERRIDE;
 
   PermissionMenuModel* menu_model_;  // Owned by |PermissionSelectorView|.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionMenuButton);
 };
@@ skipping 97 matching lines @@
                      0);
   }
   return prefsize;
 }
 
 void PermissionMenuButton::SetText(const string16& text) {
   MenuButton::SetText(text);
   SizeToPreferredSize();
 }
 
+void PermissionMenuButton::GetAccessibleState(ui::AccessibleViewState* state) {
+  MenuButton::GetAccessibleState(state);
+  state->value = text();
+}
+
 void PermissionMenuButton::OnMenuButtonClicked(View* source,
                                                const gfx::Point& point) {
   views::MenuModelAdapter menu_model_adapter(menu_model_);
   menu_runner_.reset(new views::MenuRunner(menu_model_adapter.CreateMenu()));
 
   gfx::Point p(point);
   p.Offset(-source->width(), 0);
   if (menu_runner_->RunMenuAt(
           source->GetWidget()->GetTopLevelWidget(),
           this,
@@ skipping 67 matching lines @@
   menu_button_model_.reset(new internal::PermissionMenuModel(
       type, default_setting, current_setting, this));
   bool button_enabled = source == content_settings::SETTING_SOURCE_USER;
   menu_button_ = new internal::PermissionMenuButton(
       WebsiteSettingsUI::PermissionActionToUIString(current_setting,
                                                     default_setting,
                                                     source),
       menu_button_model_.get(),
       button_enabled);
   menu_button_->SetEnabled(button_enabled);
+  menu_button_->set_focusable(true);

[msw, 2012/09/21 22:32:46]

nit: s/true/button_enabled/ ?

[markusheintz_, 2012/09/24 14:08:31]

Done. It actually doesn't matter since the is focusable method "returns
(enabled_ && focusabble_). But I think it is good that you pointed this out
since using |button_enabled_| instead of true is probably more robust.

+  menu_button_->SetAccessibleName(

[msw, 2012/09/21 22:32:46]

How are this AccessibleName and the AccessibleViewState::value strings used, and
why should they differ?

[dmazzoni, 2012/09/21 22:45:19]

I think this is right. If this is a multiple-choice control, then the name is
the description of what the control is for, and the value is the
currently-selected option.

+      WebsiteSettingsUI::PermissionTypeToUIString(type));
   layout->AddView(menu_button_);
 }
 
 void PermissionSelectorView::AddObserver(
     PermissionSelectorViewObserver* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void PermissionSelectorView::SelectionChanged() {
   // Update the icon to reflect the new setting.
@@ skipping 27 matching lines @@
   SizeToPreferredSize();
   // FIXME: The parent is only a plain |View| that is used as a
   // container/box/panel. The SizeToPreferredSize method of the parent is
   // called here directly in order not to implement a custom |View| class with
   // its own implementation of the ChildPreferredSizeChanged method.
   parent()->SizeToPreferredSize();
 }
 
 PermissionSelectorView::~PermissionSelectorView() {
 }