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

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

Issue 1350913006: Revert of Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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 "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_accessibility.h" 8 #include "ash/system/tray_accessibility.h"
9 #include "ash/system/user/login_status.h" 9 #include "ash/system/user/login_status.h"
10 #include "ash/test/shell_test_api.h" 10 #include "ash/test/shell_test_api.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 97
98 void SetShowAccessibilityOptionsInSystemTrayMenu(bool value) { 98 void SetShowAccessibilityOptionsInSystemTrayMenu(bool value) {
99 if (GetParam() == PREF_SERVICE) { 99 if (GetParam() == PREF_SERVICE) {
100 PrefService* prefs = GetProfile()->GetPrefs(); 100 PrefService* prefs = GetProfile()->GetPrefs();
101 prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, value); 101 prefs->SetBoolean(prefs::kShouldAlwaysShowAccessibilityMenu, value);
102 } else if (GetParam() == POLICY) { 102 } else if (GetParam() == POLICY) {
103 policy::PolicyMap policy_map; 103 policy::PolicyMap policy_map;
104 policy_map.Set(policy::key::kShowAccessibilityOptionsInSystemTrayMenu, 104 policy_map.Set(policy::key::kShowAccessibilityOptionsInSystemTrayMenu,
105 policy::POLICY_LEVEL_MANDATORY, 105 policy::POLICY_LEVEL_MANDATORY,
106 policy::POLICY_SCOPE_USER, 106 policy::POLICY_SCOPE_USER,
107 policy::POLICY_SOURCE_CLOUD,
108 new base::FundamentalValue(value), 107 new base::FundamentalValue(value),
109 NULL); 108 NULL);
110 provider_.UpdateChromePolicy(policy_map); 109 provider_.UpdateChromePolicy(policy_map);
111 base::RunLoop().RunUntilIdle(); 110 base::RunLoop().RunUntilIdle();
112 } else { 111 } else {
113 FAIL() << "Unknown test parameterization"; 112 FAIL() << "Unknown test parameterization";
114 } 113 }
115 } 114 }
116 115
117 ash::TrayAccessibility* tray() { 116 ash::TrayAccessibility* tray() {
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
901 EXPECT_FALSE(IsSettingsShownOnDetailMenu()); 900 EXPECT_FALSE(IsSettingsShownOnDetailMenu());
902 CloseDetailMenu(); 901 CloseDetailMenu();
903 } 902 }
904 903
905 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, 904 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
906 TrayAccessibilityTest, 905 TrayAccessibilityTest,
907 testing::Values(PREF_SERVICE, 906 testing::Values(PREF_SERVICE,
908 POLICY)); 907 POLICY));
909 908
910 } // namespace chromeos 909 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698