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

Unified Diff: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 213233003: Show a notification when a braille display is connected. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Remove LOGs Created 6 years, 9 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
Index: chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
diff --git a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
index e7f1ef4f48794c24238b80fa50470065b40b6054..c21660ba17e7e7d37251bee9403e8696e8481fd9 100644
--- a/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
+++ b/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc
@@ -10,6 +10,7 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/prefs/pref_service.h"
+#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
@@ -19,6 +20,7 @@
#include "chrome/browser/chromeos/login/startup_utils.h"
#include "chrome/browser/chromeos/login/user_manager.h"
#include "chrome/browser/chromeos/login/user_manager_impl.h"
+#include "chrome/browser/extensions/api/braille_display_private/mock_braille_controller.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_switches.h"
@@ -34,8 +36,12 @@
#include "content/public/test/test_utils.h"
#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "ui/views/controls/label.h"
#include "ui/views/widget/widget.h"
+using extensions::api::braille_display_private::BrailleObserver;
+using extensions::api::braille_display_private::DisplayState;
+using extensions::api::braille_display_private::MockBrailleController;
using testing::Return;
using testing::_;
using testing::WithParamInterface;
@@ -58,13 +64,14 @@ class TrayAccessibilityTest
TrayAccessibilityTest() {}
virtual ~TrayAccessibilityTest() {}
- // The profile which should be used by tese tests.
+ // The profile which should be used by these tests.
Profile* GetProfile() { return ProfileManager::GetActiveUserProfile(); }
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
EXPECT_CALL(provider_, IsInitializationComplete(_))
.WillRepeatedly(Return(true));
policy::BrowserPolicyConnector::SetPolicyProviderForTesting(&provider_);
+ AccessibilityManager::SetBrailleControllerForTest(&braille_controller_);
}
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
@@ -84,6 +91,10 @@ class TrayAccessibilityTest
InProcessBrowserTest::RunTestOnMainThreadLoop();
}
+ virtual void CleanUpOnMainThread() OVERRIDE {
+ AccessibilityManager::SetBrailleControllerForTest(NULL);
+ }
+
void SetShowAccessibilityOptionsInSystemTrayMenu(bool value) {
if (GetParam() == PREF_SERVICE) {
PrefService* prefs = GetProfile()->GetPrefs();
@@ -222,7 +233,26 @@ class TrayAccessibilityTest
return tray()->detailed_menu_->virtual_keyboard_view_;
}
+ bool NotificationShown() {
oshima 2014/03/26 19:42:54 and these new methodst oo?
+ return (tray()->detailed_popup_ &&
+ !tray()->detailed_popup_->GetWidget()->IsClosed());
+ }
+
+ base::string16 GetNotificationText() {
+ if (NotificationShown())
+ return tray()->detailed_popup_->GetLabelForTest()->text();
+ else
+ return base::string16();
+ }
+
+ void SetBrailleConnected(bool connected) {
+ braille_controller_.SetAvailable(connected);
+ braille_controller_.GetObserver()->OnDisplayStateChanged(
+ *braille_controller_.GetDisplayState());
+ }
+
policy::MockConfigurationPolicyProvider provider_;
+ MockBrailleController braille_controller_;
};
IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, LoginStatus) {
@@ -508,6 +538,43 @@ IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowMenuWithShowOnLoginScreen) {
EXPECT_TRUE(CanCreateMenuItem());
}
+IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, ShowNotification) {
+ const base::string16 BRAILLE_CONNECTED =
+ base::ASCIIToUTF16("Braille display connected.");
+ const base::string16 CHROMEVOX_ENABLED = base::ASCIIToUTF16(
+ "ChromeVox (spoken feedback) is enabled.\nPress Ctrl+Alt+Z to disable.");
+ const base::string16 BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED(
+ BRAILLE_CONNECTED + base::ASCIIToUTF16(" ") + CHROMEVOX_ENABLED);
+
+ EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
+
+ // Enabling spoken feedback should show the notification.
+ AccessibilityManager::Get()->EnableSpokenFeedback(
+ true, ash::A11Y_NOTIFICATION_SHOW);
+ EXPECT_EQ(CHROMEVOX_ENABLED, GetNotificationText());
+
+ // Connecting a braille display when spoken feedback is already enabled
+ // should only show the message about the braille display.
+ SetBrailleConnected(true);
+ EXPECT_EQ(BRAILLE_CONNECTED, GetNotificationText());
+
+ // Neither disconnecting a braille display, nor disabling spoken feedback
+ // should show any notification.
+ SetBrailleConnected(false);
+ EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
+ EXPECT_FALSE(NotificationShown());
+ AccessibilityManager::Get()->EnableSpokenFeedback(
+ false, ash::A11Y_NOTIFICATION_SHOW);
+ EXPECT_FALSE(NotificationShown());
+ EXPECT_FALSE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
+
+ // Connecting a braille display should enable spoken feedback and show
+ // both messages.
+ SetBrailleConnected(true);
+ EXPECT_TRUE(AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
+ EXPECT_EQ(BRAILLE_CONNECTED_AND_CHROMEVOX_ENABLED, GetNotificationText());
+}
+
IN_PROC_BROWSER_TEST_P(TrayAccessibilityTest, KeepMenuVisibilityOnLockScreen) {
// Enables high contrast mode.
AccessibilityManager::Get()->EnableHighContrast(true);

Powered by Google App Engine
This is Rietveld 408576698