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

Side by Side Diff: ash/system/ime/tray_ime_chromeos_unittest.cc

Issue 2078393005: mash: Move accessibility_types.h from ui namespace to ash namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a11y
Patch Set: fix chromevox code generated from js Created 4 years, 6 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 unified diff | Download patch
« no previous file with comments | « ash/system/ime/tray_ime_chromeos.cc ('k') | ash/system/tray_accessibility.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "ash/system/ime/tray_ime_chromeos.h" 5 #include "ash/system/ime/tray_ime_chromeos.h"
6 6
7 #include "ash/common/accessibility_delegate.h" 7 #include "ash/common/accessibility_delegate.h"
8 #include "ash/common/accessibility_types.h"
8 #include "ash/common/system/tray/wm_system_tray_notifier.h" 9 #include "ash/common/system/tray/wm_system_tray_notifier.h"
9 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
10 #include "ash/system/status_area_widget.h" 11 #include "ash/system/status_area_widget.h"
11 #include "ash/system/tray/tray_details_view.h" 12 #include "ash/system/tray/tray_details_view.h"
12 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
13 #include "ash/test/status_area_widget_test_helper.h" 14 #include "ash/test/status_area_widget_test_helper.h"
14 #include "ash/test/virtual_keyboard_test_helper.h" 15 #include "ash/test/virtual_keyboard_test_helper.h"
15 #include "base/command_line.h" 16 #include "base/command_line.h"
16 #include "ui/keyboard/keyboard_util.h" 17 #include "ui/keyboard/keyboard_util.h"
17 18
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 default_view_.reset(tray_->CreateDefaultView( 64 default_view_.reset(tray_->CreateDefaultView(
64 StatusAreaWidgetTestHelper::GetUserLoginStatus())); 65 StatusAreaWidgetTestHelper::GetUserLoginStatus()));
65 detailed_view_.reset(tray_->CreateDetailedView( 66 detailed_view_.reset(tray_->CreateDetailedView(
66 StatusAreaWidgetTestHelper::GetUserLoginStatus())); 67 StatusAreaWidgetTestHelper::GetUserLoginStatus()));
67 } 68 }
68 69
69 void TrayIMETest::SetAccessibilityKeyboardEnabled(bool enabled) { 70 void TrayIMETest::SetAccessibilityKeyboardEnabled(bool enabled) {
70 WmShell::Get()->GetAccessibilityDelegate()->SetVirtualKeyboardEnabled( 71 WmShell::Get()->GetAccessibilityDelegate()->SetVirtualKeyboardEnabled(
71 enabled); 72 enabled);
72 keyboard::SetAccessibilityKeyboardEnabled(enabled); 73 keyboard::SetAccessibilityKeyboardEnabled(enabled);
73 ui::AccessibilityNotificationVisibility notification = 74 AccessibilityNotificationVisibility notification =
74 enabled ? ui::AccessibilityNotificationVisibility::A11Y_NOTIFICATION_SHOW 75 enabled ? A11Y_NOTIFICATION_SHOW : A11Y_NOTIFICATION_NONE;
75 : ui::AccessibilityNotificationVisibility::A11Y_NOTIFICATION_NONE;
76 WmShell::Get()->system_tray_notifier()->NotifyAccessibilityModeChanged( 76 WmShell::Get()->system_tray_notifier()->NotifyAccessibilityModeChanged(
77 notification); 77 notification);
78 } 78 }
79 79
80 void TrayIMETest::TearDownViews() { 80 void TrayIMETest::TearDownViews() {
81 tray_.reset(); 81 tray_.reset();
82 default_view_.reset(); 82 default_view_.reset();
83 detailed_view_.reset(); 83 detailed_view_.reset();
84 } 84 }
85 85
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 toggle = GetScrollChildView(0); 153 toggle = GetScrollChildView(0);
154 // Clicking again should disable the keyboard. 154 // Clicking again should disable the keyboard.
155 tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(), 155 tap = ui::GestureEvent(0, 0, 0, base::TimeTicks(),
156 ui::GestureEventDetails(ui::ET_GESTURE_TAP)); 156 ui::GestureEventDetails(ui::ET_GESTURE_TAP));
157 toggle->OnGestureEvent(&tap); 157 toggle->OnGestureEvent(&tap);
158 EXPECT_FALSE(keyboard::IsKeyboardEnabled()); 158 EXPECT_FALSE(keyboard::IsKeyboardEnabled());
159 EXPECT_TRUE(default_view()->visible()); 159 EXPECT_TRUE(default_view()->visible());
160 } 160 }
161 161
162 } // namespace ash 162 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/ime/tray_ime_chromeos.cc ('k') | ash/system/tray_accessibility.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698