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

Side by Side Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 years, 1 month 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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 } 166 }
167 167
168 void SetUpCrasAndEnableChromeVox(int volume_percent, bool mute_on) { 168 void SetUpCrasAndEnableChromeVox(int volume_percent, bool mute_on) {
169 AccessibilityManager* a11y = AccessibilityManager::Get(); 169 AccessibilityManager* a11y = AccessibilityManager::Get();
170 CrasAudioHandler* cras = CrasAudioHandler::Get(); 170 CrasAudioHandler* cras = CrasAudioHandler::Get();
171 171
172 // Audio output is at |volume_percent| and |mute_on|. Spoken feedback 172 // Audio output is at |volume_percent| and |mute_on|. Spoken feedback
173 // is disabled. 173 // is disabled.
174 cras->SetOutputVolumePercent(volume_percent); 174 cras->SetOutputVolumePercent(volume_percent);
175 cras->SetOutputMute(mute_on); 175 cras->SetOutputMute(mute_on);
176 a11y->EnableSpokenFeedback(false, ash::A11Y_NOTIFICATION_NONE); 176 a11y->EnableSpokenFeedback(false, ui::A11Y_NOTIFICATION_NONE);
177 177
178 // Spoken feedback is enabled. 178 // Spoken feedback is enabled.
179 a11y->EnableSpokenFeedback(true, ash::A11Y_NOTIFICATION_NONE); 179 a11y->EnableSpokenFeedback(true, ui::A11Y_NOTIFICATION_NONE);
180 base::RunLoop().RunUntilIdle(); 180 base::RunLoop().RunUntilIdle();
181 } 181 }
182 182
183 void QuitLoopOnAutoEnrollmentProgress( 183 void QuitLoopOnAutoEnrollmentProgress(
184 policy::AutoEnrollmentState expected_state, 184 policy::AutoEnrollmentState expected_state,
185 base::RunLoop* loop, 185 base::RunLoop* loop,
186 policy::AutoEnrollmentState actual_state) { 186 policy::AutoEnrollmentState actual_state) {
187 if (expected_state == actual_state) 187 if (expected_state == actual_state)
188 loop->Quit(); 188 loop->Quit();
189 } 189 }
(...skipping 999 matching lines...) Expand 10 before | Expand all | Expand 10 after
1189 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1189 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1190 // UI and logic is ready. http://crbug.com/127016 1190 // UI and logic is ready. http://crbug.com/127016
1191 1191
1192 // TODO(dzhioev): Add tests for controller/host pairing flow. 1192 // TODO(dzhioev): Add tests for controller/host pairing flow.
1193 // http://crbug.com/375191 1193 // http://crbug.com/375191
1194 1194
1195 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 24, 1195 COMPILE_ASSERT(BaseScreenDelegate::EXIT_CODES_COUNT == 24,
1196 add_tests_for_new_control_flow_you_just_introduced); 1196 add_tests_for_new_control_flow_you_just_introduced);
1197 1197
1198 } // namespace chromeos 1198 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698