trunk/src/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc - Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos"

Side by Side Diff: trunk/src/chrome/browser/chromeos/system/tray_accessibility_browsertest.cc

Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 8 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 | Annotate | Revision Log

OLD	NEW
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 "ash/magnifier/magnification_controller.h"	5 #include "ash/magnifier/magnification_controller.h"

6 #include "ash/shell.h"	6 #include "ash/shell.h"

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

8 #include "ash/system/tray/tray_views.h"	8 #include "ash/system/tray/tray_views.h"

9 #include "ash/system/tray_accessibility.h"	9 #include "ash/system/tray_accessibility.h"

10 #include "ash/system/user/login_status.h"	10 #include "ash/system/user/login_status.h"

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

12 #include "base/prefs/pref_service.h"	12 #include "base/prefs/pref_service.h"

13 #include "chrome/browser/browser_process.h"	13 #include "chrome/browser/browser_process.h"

14 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"	14 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"

15 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"	15 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

16 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"	16 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"

17 #include "chrome/browser/chromeos/login/helper.h"	17 #include "chrome/browser/chromeos/login/helper.h"

18 #include "chrome/browser/chromeos/login/login_utils.h"	18 #include "chrome/browser/chromeos/login/login_utils.h"

19 #include "chrome/browser/chromeos/login/user_manager.h"	19 #include "chrome/browser/chromeos/login/user_manager.h"

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

21 #include "chrome/browser/chromeos/login/wizard_controller.h"	21 #include "chrome/browser/chromeos/login/wizard_controller.h"

22 #include "chrome/browser/profiles/profile.h"	22 #include "chrome/browser/profiles/profile.h"

23 #include "chrome/browser/profiles/profile_manager.h"	23 #include "chrome/browser/profiles/profile_manager.h"

24 #include "chrome/common/chrome_notification_types.h"	24 #include "chrome/common/chrome_notification_types.h"

25 #include "chrome/common/chrome_switches.h"	25 #include "chrome/common/chrome_switches.h"

26 #include "chrome/common/pref_names.h"	26 #include "chrome/common/pref_names.h"

27 #include "chrome/test/base/testing_profile.h"	27 #include "chrome/test/base/testing_profile.h"

28 #include "chromeos/chromeos_switches.h"

29 #include "content/public/test/test_utils.h"	28 #include "content/public/test/test_utils.h"

30 #include "testing/gtest/include/gtest/gtest.h"	29 #include "testing/gtest/include/gtest/gtest.h"

31 #include "ui/views/widget/widget.h"	30 #include "ui/views/widget/widget.h"

32	31

33 namespace chromeos {	32 namespace chromeos {

34	33

35 void SetMagnifierEnabled(bool enabled) {	34 void SetMagnifierEnabled(bool enabled) {

36 MagnificationManager::Get()->SetMagnifierEnabled(enabled);	35 MagnificationManager::Get()->SetMagnifierEnabled(enabled);

37 }	36 }

38	37

(...skipping 439 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
478 accessibility::EnableHighContrast(false);	477 accessibility::EnableHighContrast(false);

479 SetMagnifierEnabled(false);	478 SetMagnifierEnabled(false);

480 EXPECT_TRUE(CreateDetailedMenu());	479 EXPECT_TRUE(CreateDetailedMenu());

481 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());	480 EXPECT_FALSE(IsSpokenFeedbackEnabledOnDetailMenu());

482 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());	481 EXPECT_FALSE(IsHighContrastEnabledOnDetailMenu());

483 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());	482 EXPECT_FALSE(IsScreenMagnifierEnabledOnDetailMenu());

484 CloseDetailMenu();	483 CloseDetailMenu();

485 }	484 }

486	485

487 } // namespace chromeos	486 } // namespace chromeos

OLD	NEW