chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/browser/chromeos/accessibility/spoken_feedback_browsertest.cc

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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/wm/workspace_controller_unittest.cc ('k') | chrome/browser/chromeos/accessibility/sticky_keys_browsertest.cc » ('j') | no next file with comments »

OLD	NEW
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 <queue>	5 #include <queue>

6	6

7 #include "ash/accelerators/accelerator_controller.h"	7 #include "ash/accelerators/accelerator_controller.h"

8 #include "ash/accelerators/accelerator_table.h"	8 #include "ash/accelerators/accelerator_table.h"

9 #include "ash/common/accessibility_types.h"	9 #include "ash/common/accessibility_types.h"

	10 #include "ash/common/system/tray/system_tray.h"

10 #include "ash/shell.h"	11 #include "ash/shell.h"

11 #include "ash/system/tray/system_tray.h"

12 #include "base/command_line.h"	12 #include "base/command_line.h"

13 #include "base/macros.h"	13 #include "base/macros.h"

14 #include "base/strings/pattern.h"	14 #include "base/strings/pattern.h"

15 #include "base/strings/string_util.h"	15 #include "base/strings/string_util.h"

16 #include "chrome/app/chrome_command_ids.h"	16 #include "chrome/app/chrome_command_ids.h"

17 #include "chrome/browser/chrome_notification_types.h"	17 #include "chrome/browser/chrome_notification_types.h"

18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"	18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

19 #include "chrome/browser/chromeos/accessibility/speech_monitor.h"	19 #include "chrome/browser/chromeos/accessibility/speech_monitor.h"

20 #include "chrome/browser/chromeos/login/login_manager_test.h"	20 #include "chrome/browser/chromeos/login/login_manager_test.h"

21 #include "chrome/browser/chromeos/login/ui/login_display_host.h"	21 #include "chrome/browser/chromeos/login/ui/login_display_host.h"

(...skipping 726 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
748 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(	748 ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(

749 window, ui::VKEY_TAB, false, true /shift/, false, false));	749 window, ui::VKEY_TAB, false, true /shift/, false, false));

750 while (speech_monitor_.GetNextUtterance() != "Select your language:") {	750 while (speech_monitor_.GetNextUtterance() != "Select your language:") {

751 }	751 }

752 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance());	752 EXPECT_EQ("English ( United States)", speech_monitor_.GetNextUtterance());

753 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(),	753 EXPECT_TRUE(base::MatchPattern(speech_monitor_.GetNextUtterance(),

754 "Combo box * of *"));	754 "Combo box * of *"));

755 }	755 }

756	756

757 } // namespace chromeos	757 } // namespace chromeos

OLD	NEW