| 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/common/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" | 
| 6 | 6 | 
| 7 #include "ash/common/shell_observer.h" |  | 
| 8 #include "ash/common/wm/window_state.h" |  | 
| 9 #include "ash/common/wm_shell.h" |  | 
| 10 #include "ash/shell.h" | 7 #include "ash/shell.h" | 
|  | 8 #include "ash/shell_observer.h" | 
| 11 #include "ash/system/network/network_observer.h" | 9 #include "ash/system/network/network_observer.h" | 
| 12 #include "ash/system/tray/system_tray_delegate.h" | 10 #include "ash/system/tray/system_tray_delegate.h" | 
| 13 #include "ash/system/tray/system_tray_notifier.h" | 11 #include "ash/system/tray/system_tray_notifier.h" | 
| 14 #include "ash/test/ash_interactive_ui_test_base.h" | 12 #include "ash/test/ash_interactive_ui_test_base.h" | 
| 15 #include "ash/test/test_screenshot_delegate.h" | 13 #include "ash/test/test_screenshot_delegate.h" | 
|  | 14 #include "ash/wm/window_state.h" | 
| 16 #include "ash/wm/window_state_aura.h" | 15 #include "ash/wm/window_state_aura.h" | 
| 17 #include "ash/wm/window_util.h" | 16 #include "ash/wm/window_util.h" | 
|  | 17 #include "ash/wm_shell.h" | 
| 18 #include "base/run_loop.h" | 18 #include "base/run_loop.h" | 
| 19 #include "base/test/user_action_tester.cc" | 19 #include "base/test/user_action_tester.cc" | 
| 20 #include "chromeos/network/network_handler.h" | 20 #include "chromeos/network/network_handler.h" | 
| 21 #include "mojo/edk/embedder/embedder.h" | 21 #include "mojo/edk/embedder/embedder.h" | 
| 22 #include "ui/app_list/presenter/app_list.h" | 22 #include "ui/app_list/presenter/app_list.h" | 
| 23 #include "ui/app_list/presenter/test/test_app_list_presenter.h" | 23 #include "ui/app_list/presenter/test/test_app_list_presenter.h" | 
| 24 #include "ui/base/test/ui_controls.h" | 24 #include "ui/base/test/ui_controls.h" | 
| 25 | 25 | 
| 26 namespace ash { | 26 namespace ash { | 
| 27 namespace test { | 27 namespace test { | 
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 207   SendKeyPressSync(ui::VKEY_LWIN, false, false, false); | 207   SendKeyPressSync(ui::VKEY_LWIN, false, false, false); | 
| 208   RunAllPendingInMessageLoop(); | 208   RunAllPendingInMessageLoop(); | 
| 209   EXPECT_EQ(1u, test_app_list_presenter.toggle_count()); | 209   EXPECT_EQ(1u, test_app_list_presenter.toggle_count()); | 
| 210   SendKeyPressSync(ui::VKEY_LWIN, false, false, false); | 210   SendKeyPressSync(ui::VKEY_LWIN, false, false, false); | 
| 211   RunAllPendingInMessageLoop(); | 211   RunAllPendingInMessageLoop(); | 
| 212   EXPECT_EQ(2u, test_app_list_presenter.toggle_count()); | 212   EXPECT_EQ(2u, test_app_list_presenter.toggle_count()); | 
| 213 } | 213 } | 
| 214 | 214 | 
| 215 }  // namespace test | 215 }  // namespace test | 
| 216 }  // namespace ash | 216 }  // namespace ash | 
| OLD | NEW | 
|---|