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

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

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed another test. 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,
107 new base::FundamentalValue(value), 108 new base::FundamentalValue(value),
108 NULL); 109 NULL);
109 provider_.UpdateChromePolicy(policy_map); 110 provider_.UpdateChromePolicy(policy_map);
110 base::RunLoop().RunUntilIdle(); 111 base::RunLoop().RunUntilIdle();
111 } else { 112 } else {
112 FAIL() << "Unknown test parameterization"; 113 FAIL() << "Unknown test parameterization";
113 } 114 }
114 } 115 }
115 116
116 ash::TrayAccessibility* tray() { 117 ash::TrayAccessibility* tray() {
(...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 EXPECT_FALSE(IsSettingsShownOnDetailMenu()); 901 EXPECT_FALSE(IsSettingsShownOnDetailMenu());
901 CloseDetailMenu(); 902 CloseDetailMenu();
902 } 903 }
903 904
904 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, 905 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance,
905 TrayAccessibilityTest, 906 TrayAccessibilityTest,
906 testing::Values(PREF_SERVICE, 907 testing::Values(PREF_SERVICE,
907 POLICY)); 908 POLICY));
908 909
909 } // namespace chromeos 910 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698