| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/extensions/extension_accessibility_api.h" | 10 #include "chrome/browser/extensions/extension_accessibility_api.h" |
| 11 #include "chrome/browser/ui/views/accessibility_event_router_views.h" | 11 #include "chrome/browser/ui/views/accessibility_event_router_views.h" |
| 12 #include "chrome/common/chrome_notification_types.h" | 12 #include "chrome/common/chrome_notification_types.h" |
| 13 #include "chrome/test/base/testing_profile.h" | 13 #include "chrome/test/base/testing_profile.h" |
| 14 #include "chrome/test/testing_browser_process_test.h" |
| 14 #include "content/common/notification_registrar.h" | 15 #include "content/common/notification_registrar.h" |
| 15 #include "content/common/notification_service.h" | 16 #include "content/common/notification_service.h" |
| 16 #include "testing/gtest/include/gtest/gtest.h" | 17 #include "testing/gtest/include/gtest/gtest.h" |
| 17 #include "views/controls/button/text_button.h" | 18 #include "views/controls/button/text_button.h" |
| 18 #include "views/layout/grid_layout.h" | 19 #include "views/layout/grid_layout.h" |
| 19 #include "views/views_delegate.h" | 20 #include "views/views_delegate.h" |
| 20 #include "views/widget/native_widget.h" | 21 #include "views/widget/native_widget.h" |
| 21 #include "views/widget/root_view.h" | 22 #include "views/widget/root_view.h" |
| 22 #include "views/widget/widget.h" | 23 #include "views/widget/widget.h" |
| 23 #include "views/widget/widget_delegate.h" | 24 #include "views/widget/widget_delegate.h" |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 virtual const views::Widget* GetWidget() const OVERRIDE { | 83 virtual const views::Widget* GetWidget() const OVERRIDE { |
| 83 return contents_->GetWidget(); | 84 return contents_->GetWidget(); |
| 84 } | 85 } |
| 85 virtual views::Widget* GetWidget() OVERRIDE { return contents_->GetWidget(); } | 86 virtual views::Widget* GetWidget() OVERRIDE { return contents_->GetWidget(); } |
| 86 | 87 |
| 87 private: | 88 private: |
| 88 views::View* contents_; | 89 views::View* contents_; |
| 89 }; | 90 }; |
| 90 | 91 |
| 91 class AccessibilityEventRouterViewsTest | 92 class AccessibilityEventRouterViewsTest |
| 92 : public testing::Test, | 93 : public TestingBrowserProcessTest, |
| 93 public NotificationObserver { | 94 public NotificationObserver { |
| 94 public: | 95 public: |
| 95 virtual void SetUp() { | 96 virtual void SetUp() { |
| 96 views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate(); | 97 views::ViewsDelegate::views_delegate = new AccessibilityViewsDelegate(); |
| 97 window_delegate_ = NULL; | 98 window_delegate_ = NULL; |
| 98 } | 99 } |
| 99 | 100 |
| 100 virtual void TearDown() { | 101 virtual void TearDown() { |
| 101 delete views::ViewsDelegate::views_delegate; | 102 delete views::ViewsDelegate::views_delegate; |
| 102 views::ViewsDelegate::views_delegate = NULL; | 103 views::ViewsDelegate::views_delegate = NULL; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 EXPECT_EQ(2, focus_event_count_); | 185 EXPECT_EQ(2, focus_event_count_); |
| 185 EXPECT_EQ(kButton3NewASCII, last_control_name_); | 186 EXPECT_EQ(kButton3NewASCII, last_control_name_); |
| 186 | 187 |
| 187 // Advance to button 1 and check the notification. | 188 // Advance to button 1 and check the notification. |
| 188 focus_manager->AdvanceFocus(false); | 189 focus_manager->AdvanceFocus(false); |
| 189 EXPECT_EQ(3, focus_event_count_); | 190 EXPECT_EQ(3, focus_event_count_); |
| 190 EXPECT_EQ(kButton1ASCII, last_control_name_); | 191 EXPECT_EQ(kButton1ASCII, last_control_name_); |
| 191 } | 192 } |
| 192 | 193 |
| 193 #endif // defined(TOOLKIT_VIEWS) | 194 #endif // defined(TOOLKIT_VIEWS) |
| OLD | NEW |