| 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/common/accessibility_types.h" | 5 #include "ash/common/accessibility_types.h" |
| 6 #include "ash/common/login_status.h" | 6 #include "ash/common/login_status.h" |
| 7 #include "ash/common/system/tray/system_tray.h" | 7 #include "ash/common/system/tray/system_tray.h" |
| 8 #include "ash/common/system/tray_accessibility.h" | 8 #include "ash/common/system/tray_accessibility.h" |
| 9 #include "ash/magnifier/magnification_controller.h" | 9 #include "ash/magnifier/magnification_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 142 return menu_item_view != NULL; | 142 return menu_item_view != NULL; |
| 143 } | 143 } |
| 144 | 144 |
| 145 void SetLoginStatus(ash::LoginStatus status) { | 145 void SetLoginStatus(ash::LoginStatus status) { |
| 146 tray()->UpdateAfterLoginStatusChange(status); | 146 tray()->UpdateAfterLoginStatusChange(status); |
| 147 } | 147 } |
| 148 | 148 |
| 149 ash::LoginStatus GetLoginStatus() { return tray()->login_; } | 149 ash::LoginStatus GetLoginStatus() { return tray()->login_; } |
| 150 | 150 |
| 151 bool CreateDetailedMenu() { | 151 bool CreateDetailedMenu() { |
| 152 tray()->PopupDetailedView(0, false); | 152 tray()->ShowDetailedView(0, false); |
| 153 return tray()->detailed_menu_ != NULL; | 153 return tray()->detailed_menu_ != NULL; |
| 154 } | 154 } |
| 155 | 155 |
| 156 void CloseDetailMenu() { | 156 void CloseDetailMenu() { |
| 157 CHECK(tray()->detailed_menu_); | 157 CHECK(tray()->detailed_menu_); |
| 158 tray()->DestroyDetailedView(); | 158 tray()->DestroyDetailedView(); |
| 159 tray()->detailed_menu_ = NULL; | 159 tray()->detailed_menu_ = NULL; |
| 160 } | 160 } |
| 161 | 161 |
| 162 void ClickSpokenFeedbackOnDetailMenu() { | 162 void ClickSpokenFeedbackOnDetailMenu() { |
| (...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 904 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); | 904 EXPECT_FALSE(IsSettingsAvailableOnDetailMenu()); |
| 905 CloseDetailMenu(); | 905 CloseDetailMenu(); |
| 906 } | 906 } |
| 907 | 907 |
| 908 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, | 908 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, |
| 909 TrayAccessibilityTest, | 909 TrayAccessibilityTest, |
| 910 testing::Values(PREF_SERVICE, | 910 testing::Values(PREF_SERVICE, |
| 911 POLICY)); | 911 POLICY)); |
| 912 | 912 |
| 913 } // namespace chromeos | 913 } // namespace chromeos |
| OLD | NEW |