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/accessibility_types.h" | 5 #include "ash/accessibility_types.h" |
6 #include "ash/login_status.h" | 6 #include "ash/login_status.h" |
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 "ash/system/tray/system_tray.h" | 9 #include "ash/system/tray/system_tray.h" |
| 10 #include "ash/system/tray/system_tray_test_api.h" |
10 #include "ash/system/tray_accessibility.h" | 11 #include "ash/system/tray_accessibility.h" |
11 #include "ash/test/shell_test_api.h" | 12 #include "ash/test/shell_test_api.h" |
12 #include "base/callback.h" | 13 #include "base/callback.h" |
13 #include "base/command_line.h" | 14 #include "base/command_line.h" |
14 #include "base/memory/ptr_util.h" | 15 #include "base/memory/ptr_util.h" |
15 #include "base/strings/utf_string_conversions.h" | 16 #include "base/strings/utf_string_conversions.h" |
16 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
17 #include "chrome/browser/chrome_notification_types.h" | 18 #include "chrome/browser/chrome_notification_types.h" |
18 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 19 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
19 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 20 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
108 policy::POLICY_SOURCE_CLOUD, | 109 policy::POLICY_SOURCE_CLOUD, |
109 base::MakeUnique<base::Value>(value), nullptr); | 110 base::MakeUnique<base::Value>(value), nullptr); |
110 provider_.UpdateChromePolicy(policy_map); | 111 provider_.UpdateChromePolicy(policy_map); |
111 base::RunLoop().RunUntilIdle(); | 112 base::RunLoop().RunUntilIdle(); |
112 } else { | 113 } else { |
113 FAIL() << "Unknown test parameterization"; | 114 FAIL() << "Unknown test parameterization"; |
114 } | 115 } |
115 } | 116 } |
116 | 117 |
117 ash::TrayAccessibility* tray() { | 118 ash::TrayAccessibility* tray() { |
118 return ash::Shell::Get() | 119 return const_cast<ash::TrayAccessibility*>( |
119 ->GetPrimarySystemTray() | 120 const_cast<const TrayAccessibilityTest*>(this)->tray()); |
120 ->GetTrayAccessibilityForTest(); | |
121 } | 121 } |
122 | 122 |
123 const ash::TrayAccessibility* tray() const { | 123 const ash::TrayAccessibility* tray() const { |
124 return ash::Shell::Get() | 124 return ash::SystemTrayTestApi(ash::Shell::Get()->GetPrimarySystemTray()) |
125 ->GetPrimarySystemTray() | 125 .tray_accessibility(); |
126 ->GetTrayAccessibilityForTest(); | |
127 } | 126 } |
128 | 127 |
129 bool IsTrayIconVisible() const { return tray()->tray_icon_visible_; } | 128 bool IsTrayIconVisible() const { return tray()->tray_icon_visible_; } |
130 | 129 |
131 views::View* CreateMenuItem() { | 130 views::View* CreateMenuItem() { |
132 return tray()->CreateDefaultView(GetLoginStatus()); | 131 return tray()->CreateDefaultView(GetLoginStatus()); |
133 } | 132 } |
134 | 133 |
135 void DestroyMenuItem() { return tray()->OnDefaultViewDestroyed(); } | 134 void DestroyMenuItem() { return tray()->OnDefaultViewDestroyed(); } |
136 | 135 |
(...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1706 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu()); | 1705 EXPECT_TRUE(IsTapDraggingMenuShownOnDetailMenu()); |
1707 CloseDetailMenu(); | 1706 CloseDetailMenu(); |
1708 } | 1707 } |
1709 | 1708 |
1710 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, | 1709 INSTANTIATE_TEST_CASE_P(TrayAccessibilityTestInstance, |
1711 TrayAccessibilityTest, | 1710 TrayAccessibilityTest, |
1712 testing::Values(PREF_SERVICE, | 1711 testing::Values(PREF_SERVICE, |
1713 POLICY)); | 1712 POLICY)); |
1714 | 1713 |
1715 } // namespace chromeos | 1714 } // namespace chromeos |
OLD | NEW |