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_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 "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
106 policy::POLICY_SCOPE_USER, | 106 policy::POLICY_SCOPE_USER, |
107 base::Value::CreateBooleanValue(value), | 107 base::Value::CreateBooleanValue(value), |
108 NULL); | 108 NULL); |
109 provider_.UpdateChromePolicy(policy_map); | 109 provider_.UpdateChromePolicy(policy_map); |
110 base::RunLoop().RunUntilIdle(); | 110 base::RunLoop().RunUntilIdle(); |
111 } else { | 111 } else { |
112 FAIL() << "Unknown test parameterization"; | 112 FAIL() << "Unknown test parameterization"; |
113 } | 113 } |
114 } | 114 } |
115 | 115 |
116 ash::internal::TrayAccessibility* tray() { | 116 ash::TrayAccessibility* tray() { |
117 return ash::Shell::GetInstance()->GetPrimarySystemTray()-> | 117 return ash::Shell::GetInstance()->GetPrimarySystemTray()-> |
118 GetTrayAccessibilityForTest(); | 118 GetTrayAccessibilityForTest(); |
119 } | 119 } |
120 | 120 |
121 const ash::internal::TrayAccessibility* tray() const { | 121 const ash::TrayAccessibility* tray() const { |
122 return ash::Shell::GetInstance() | 122 return ash::Shell::GetInstance() |
123 ->GetPrimarySystemTray() | 123 ->GetPrimarySystemTray() |
124 ->GetTrayAccessibilityForTest(); | 124 ->GetTrayAccessibilityForTest(); |
125 } | 125 } |
126 | 126 |
127 bool IsTrayIconVisible() const { return tray()->tray_icon_visible_; } | 127 bool IsTrayIconVisible() const { return tray()->tray_icon_visible_; } |
128 | 128 |
129 views::View* CreateMenuItem() { | 129 views::View* CreateMenuItem() { |
130 return tray()->CreateDefaultView(GetLoginStatus()); | 130 return tray()->CreateDefaultView(GetLoginStatus()); |
131 } | 131 } |
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
873 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); | 873 EXPECT_TRUE(IsVirtualKeyboardMenuShownOnDetailMenu()); |
874 CloseDetailMenu(); | 874 CloseDetailMenu(); |
875 } | 875 } |
876 | 876 |
877 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, | 877 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, |
878 TrayAccessibilityTest, | 878 TrayAccessibilityTest, |
879 testing::Values(PREF_SERVICE, | 879 testing::Values(PREF_SERVICE, |
880 POLICY)); | 880 POLICY)); |
881 | 881 |
882 } // namespace chromeos | 882 } // namespace chromeos |
OLD | NEW |