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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/chromeos/login/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include "ash/common/accessibility_types.h"
7 #include "base/command_line.h" 8 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
9 #include "base/macros.h" 10 #include "base/macros.h"
10 #include "base/run_loop.h" 11 #include "base/run_loop.h"
11 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
12 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/browser/browser_process.h" 14 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/browser_shutdown.h" 15 #include "chrome/browser/browser_shutdown.h"
15 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
16 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 17 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 } 158 }
158 159
159 void SetUpCrasAndEnableChromeVox(int volume_percent, bool mute_on) { 160 void SetUpCrasAndEnableChromeVox(int volume_percent, bool mute_on) {
160 AccessibilityManager* a11y = AccessibilityManager::Get(); 161 AccessibilityManager* a11y = AccessibilityManager::Get();
161 CrasAudioHandler* cras = CrasAudioHandler::Get(); 162 CrasAudioHandler* cras = CrasAudioHandler::Get();
162 163
163 // Audio output is at |volume_percent| and |mute_on|. Spoken feedback 164 // Audio output is at |volume_percent| and |mute_on|. Spoken feedback
164 // is disabled. 165 // is disabled.
165 cras->SetOutputVolumePercent(volume_percent); 166 cras->SetOutputVolumePercent(volume_percent);
166 cras->SetOutputMute(mute_on); 167 cras->SetOutputMute(mute_on);
167 a11y->EnableSpokenFeedback(false, ui::A11Y_NOTIFICATION_NONE); 168 a11y->EnableSpokenFeedback(false, ash::A11Y_NOTIFICATION_NONE);
168 169
169 // Spoken feedback is enabled. 170 // Spoken feedback is enabled.
170 a11y->EnableSpokenFeedback(true, ui::A11Y_NOTIFICATION_NONE); 171 a11y->EnableSpokenFeedback(true, ash::A11Y_NOTIFICATION_NONE);
171 base::RunLoop().RunUntilIdle(); 172 base::RunLoop().RunUntilIdle();
172 } 173 }
173 174
174 void QuitLoopOnAutoEnrollmentProgress( 175 void QuitLoopOnAutoEnrollmentProgress(
175 policy::AutoEnrollmentState expected_state, 176 policy::AutoEnrollmentState expected_state,
176 base::RunLoop* loop, 177 base::RunLoop* loop,
177 policy::AutoEnrollmentState actual_state) { 178 policy::AutoEnrollmentState actual_state) {
178 if (expected_state == actual_state) 179 if (expected_state == actual_state)
179 loop->Quit(); 180 loop->Quit();
180 } 181 }
(...skipping 1040 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1222 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1222 // UI and logic is ready. http://crbug.com/127016 1223 // UI and logic is ready. http://crbug.com/127016
1223 1224
1224 // TODO(dzhioev): Add tests for controller/host pairing flow. 1225 // TODO(dzhioev): Add tests for controller/host pairing flow.
1225 // http://crbug.com/375191 1226 // http://crbug.com/375191
1226 1227
1227 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 23, 1228 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 23,
1228 "tests for new control flow are missing"); 1229 "tests for new control flow are missing");
1229 1230
1230 } // namespace chromeos 1231 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698