chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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 | « chrome/browser/chromeos/accessibility/accessibility_manager.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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/accessibility/accessibility_manager.h"	5 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"

6	6

7 #include "ash/magnifier/magnification_controller.h"	7 #include "ash/magnifier/magnification_controller.h"

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

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

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

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

12 #include "chrome/browser/browser_process.h"	11 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/chrome_notification_types.h"	12 #include "chrome/browser/chrome_notification_types.h"

14 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"	13 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"

15 #include "chrome/browser/chromeos/login/helper.h"	14 #include "chrome/browser/chromeos/login/helper.h"

16 #include "chrome/browser/chromeos/login/session/user_session_manager.h"	15 #include "chrome/browser/chromeos/login/session/user_session_manager.h"

17 #include "chrome/browser/chromeos/preferences.h"	16 #include "chrome/browser/chromeos/preferences.h"

18 #include "chrome/browser/chromeos/profiles/profile_helper.h"	17 #include "chrome/browser/chromeos/profiles/profile_helper.h"

19 #include "chrome/browser/extensions/api/braille_display_private/mock_braille_con troller.h"	18 #include "chrome/browser/extensions/api/braille_display_private/mock_braille_con troller.h"

20 #include "chrome/browser/prefs/pref_service_syncable_util.h"	19 #include "chrome/browser/prefs/pref_service_syncable_util.h"

21 #include "chrome/browser/profiles/profile.h"	20 #include "chrome/browser/profiles/profile.h"

22 #include "chrome/browser/profiles/profile_manager.h"	21 #include "chrome/browser/profiles/profile_manager.h"

23 #include "chrome/common/extensions/extension_constants.h"	22 #include "chrome/common/extensions/extension_constants.h"

24 #include "chrome/common/pref_names.h"	23 #include "chrome/common/pref_names.h"

25 #include "chrome/test/base/in_process_browser_test.h"	24 #include "chrome/test/base/in_process_browser_test.h"

26 #include "chrome/test/base/testing_profile.h"	25 #include "chrome/test/base/testing_profile.h"

27 #include "chromeos/chromeos_switches.h"	26 #include "chromeos/chromeos_switches.h"

28 #include "chromeos/login/user_names.h"	27 #include "chromeos/login/user_names.h"

	28 #include "components/prefs/pref_service.h"

29 #include "components/signin/core/account_id/account_id.h"	29 #include "components/signin/core/account_id/account_id.h"

30 #include "components/syncable_prefs/pref_service_syncable.h"	30 #include "components/syncable_prefs/pref_service_syncable.h"

31 #include "components/user_manager/user_manager.h"	31 #include "components/user_manager/user_manager.h"

32 #include "content/public/browser/notification_service.h"	32 #include "content/public/browser/notification_service.h"

33 #include "content/public/test/test_utils.h"	33 #include "content/public/test/test_utils.h"

34 #include "testing/gtest/include/gtest/gtest.h"	34 #include "testing/gtest/include/gtest/gtest.h"

35 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"	35 #include "ui/base/ime/chromeos/component_extension_ime_manager.h"

36 #include "ui/base/ime/chromeos/input_method_manager.h"	36 #include "ui/base/ime/chromeos/input_method_manager.h"

37	37

38 using chromeos::input_method::InputMethodManager;	38 using chromeos::input_method::InputMethodManager;

(...skipping 672 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
711 EXPECT_FALSE(ShouldShowAccessibilityMenu());	711 EXPECT_FALSE(ShouldShowAccessibilityMenu());

712	712

713 // Check on-screen keyboard.	713 // Check on-screen keyboard.

714 SetVirtualKeyboardEnabled(true);	714 SetVirtualKeyboardEnabled(true);

715 EXPECT_TRUE(ShouldShowAccessibilityMenu());	715 EXPECT_TRUE(ShouldShowAccessibilityMenu());

716 SetVirtualKeyboardEnabled(false);	716 SetVirtualKeyboardEnabled(false);

717 EXPECT_FALSE(ShouldShowAccessibilityMenu());	717 EXPECT_FALSE(ShouldShowAccessibilityMenu());

718 }	718 }

719	719

720 } // namespace chromeos	720 } // namespace chromeos

OLD	NEW