| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
| 6 | 6 |
| 7 #include "ash/common/shell_observer.h" | 7 #include "ash/common/shell_observer.h" |
| 8 #include "ash/common/system/chromeos/network/network_observer.h" | 8 #include "ash/common/system/chromeos/network/network_observer.h" |
| 9 #include "ash/common/system/tray/system_tray_delegate.h" | 9 #include "ash/common/system/tray/system_tray_delegate.h" |
| 10 #include "ash/common/system/tray/system_tray_notifier.h" | 10 #include "ash/common/system/tray/system_tray_notifier.h" |
| (...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 EXPECT_TRUE(network_observer.wifi_enabled_status()); | 191 EXPECT_TRUE(network_observer.wifi_enabled_status()); |
| 192 SendKeyPressSync(ui::VKEY_WLAN, false, false, false); | 192 SendKeyPressSync(ui::VKEY_WLAN, false, false, false); |
| 193 EXPECT_FALSE(network_observer.wifi_enabled_status()); | 193 EXPECT_FALSE(network_observer.wifi_enabled_status()); |
| 194 | 194 |
| 195 WmShell::Get()->system_tray_notifier()->RemoveNetworkObserver( | 195 WmShell::Get()->system_tray_notifier()->RemoveNetworkObserver( |
| 196 &network_observer); | 196 &network_observer); |
| 197 } | 197 } |
| 198 | 198 |
| 199 // Tests the app list accelerator. | 199 // Tests the app list accelerator. |
| 200 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) { | 200 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) { |
| 201 EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility()); | 201 EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility()); |
| 202 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); | 202 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); |
| 203 EXPECT_TRUE(Shell::GetInstance()->GetAppListTargetVisibility()); | 203 EXPECT_TRUE(WmShell::Get()->GetAppListTargetVisibility()); |
| 204 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); | 204 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); |
| 205 EXPECT_FALSE(Shell::GetInstance()->GetAppListTargetVisibility()); | 205 EXPECT_FALSE(WmShell::Get()->GetAppListTargetVisibility()); |
| 206 } | 206 } |
| 207 | 207 |
| 208 } // namespace test | 208 } // namespace test |
| 209 } // namespace ash | 209 } // namespace ash |
| OLD | NEW |