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

Unified Diff: chrome/browser/views/browser_keyboard_accessibility_test_win.cc

Issue 3046031: Revert 54074 - Add initial tests for keyboard access (tabbing in some dialogs... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 5 months 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
« no previous file with comments | « chrome/browser/views/bookmark_bar_view_test.cc ('k') | chrome/browser/views/chrome_views_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/browser_keyboard_accessibility_test_win.cc
===================================================================
--- chrome/browser/views/browser_keyboard_accessibility_test_win.cc (revision 54089)
+++ chrome/browser/views/browser_keyboard_accessibility_test_win.cc (working copy)
@@ -1,175 +0,0 @@
-// 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 "base/keyboard_codes.h"
-#include "chrome/browser/automation/ui_controls.h"
-#include "chrome/browser/views/chrome_views_delegate.h"
-#include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/test/in_process_browser_test.h"
-#include "chrome/test/ui_test_utils.h"
-#include "views/view.h"
-#include "views/accessibility/view_accessibility.h"
-#include "views/widget/widget.h"
-#include "views/window/window.h"
-
-namespace {
-
-class BrowserKeyboardAccessibility : public InProcessBrowserTest,
- public ChromeViewsDelegate {
- public:
- BrowserKeyboardAccessibility()
- : is_waiting_(false),
- current_view_(NULL) {
- // Set ourselves as the currently active ViewsDelegate.
- ViewsDelegate::views_delegate = this;
- }
-
- ~BrowserKeyboardAccessibility() {}
-
- // Overidden from ChromeViewsDelegate.
- // Save the last notification sent by views::View::NotifyAccessibilityEvent.
- virtual void NotifyAccessibilityEvent(
- views::View* view, AccessibilityTypes::Event event_type) {
- current_view_ = view;
- current_event_type_ = event_type;
-
- // Are we within a message loop waiting for a particular event?
- if (is_waiting_) {
- is_waiting_ = false;
- MessageLoop::current()->Quit();
- }
- }
-
- // Helper that performs tabbing until it cycles back to the original focus.
- void TabCyclerForwardAndBack(gfx::NativeWindow hwnd);
- void TabCycler(gfx::NativeWindow hwnd, bool forward_tab);
-
- views::View* current_view() const { return current_view_; }
-
- gfx::NativeWindow current_view_native_window() const {
- return current_view()->GetWidget()->GetNativeView();
- }
-
- AccessibilityTypes::Event current_event() const {
- return current_event_type_;
- }
-
- void set_waiting(bool value) { is_waiting_ = value; }
-
- private:
- // Are we waiting for an event?
- bool is_waiting_;
-
- // View of interest (i.e. for testing or one we are waiting to gain focus).
- views::View* current_view_;
-
- // Event type of interest.
- AccessibilityTypes::Event current_event_type_;
-};
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInAboutChromeDialog) {
- views::Window* about_chrome_window =
- BrowserView::GetBrowserViewForNativeWindow(
- browser()->window()->GetNativeHandle())->ShowAboutChromeDialog();
-
- TabCyclerForwardAndBack(about_chrome_window->GetNativeWindow());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
- TabInClearBrowsingDataDialog) {
- browser()->OpenClearBrowsingDataDialog();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
- TabInImportSettingsDialog) {
- browser()->OpenImportSettingsDialog();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInKeywordEditor) {
- browser()->OpenKeywordEditor();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInOptionsDialog) {
- browser()->OpenOptionsDialog();
-
- // Tab through each of the three tabs.
- for (int i = 0; i < 3; ++i) {
- TabCyclerForwardAndBack(current_view_native_window());
- ui_controls::SendKeyPressNotifyWhenDone(current_view_native_window(),
- base::VKEY_TAB,
- true, false, false, false,
- new MessageLoop::QuitTask());
- set_waiting(true);
- ui_test_utils::RunMessageLoop();
- }
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInPasswordManager) {
- browser()->OpenPasswordManager();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-// TODO(dtseng): http://www.crbug.com/50402
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
- FAILS_TabInSyncMyBookmarksDialog) {
- browser()->OpenSyncMyBookmarksDialog();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInTaskManager) {
- browser()->OpenTaskManager();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInToolbar) {
- gfx::NativeWindow native_window = browser()->window()->GetNativeHandle();
- ui_controls::SendKeyPressNotifyWhenDone(native_window,
- base::VKEY_T,
- false, true, true, false,
- new MessageLoop::QuitTask());
- set_waiting(true);
- ui_test_utils::RunMessageLoop();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility, TabInUpdateChromeDialog) {
- browser()->OpenUpdateChromeDialog();
- TabCyclerForwardAndBack(current_view_native_window());
-}
-
-void BrowserKeyboardAccessibility::TabCyclerForwardAndBack(
- gfx::NativeWindow hwnd) {
- TabCycler(hwnd, true);
- TabCycler(hwnd, false);
-}
-
-void BrowserKeyboardAccessibility::TabCycler(gfx::NativeWindow hwnd,
- bool forward_tab) {
- // Wait for a focus event on the provided native window.
- while (current_event() != AccessibilityTypes::EVENT_FOCUS ||
- current_view_native_window() != hwnd) {
- set_waiting(true);
- ui_test_utils::RunMessageLoop();
- }
-
- views::View* first_focused_item = current_view();
-
- ASSERT_TRUE(first_focused_item != NULL);
-
- views::View* next_focused_item = first_focused_item;
-
- // Keep tabbing until we reach the originally focused view.
- do {
- ui_controls::SendKeyPressNotifyWhenDone(hwnd, base::VKEY_TAB,
- false, !forward_tab, false, false, new MessageLoop::QuitTask());
- set_waiting(true);
- ui_test_utils::RunMessageLoop();
- next_focused_item = current_view();
- } while (first_focused_item != next_focused_item);
-}
-
-} // namespace
« no previous file with comments | « chrome/browser/views/bookmark_bar_view_test.cc ('k') | chrome/browser/views/chrome_views_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698