Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(480)

Side by Side Diff: ash/accelerators/accelerator_interactive_uitest_chromeos.cc

Issue 2056823002: mash: Move SystemTrayDelegate and dependencies to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/tray/system_tray_delegate.h"
8 #include "ash/common/wm/window_state.h" 9 #include "ash/common/wm/window_state.h"
9 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
10 #include "ash/shell.h" 11 #include "ash/shell.h"
11 #include "ash/system/chromeos/network/network_observer.h" 12 #include "ash/system/chromeos/network/network_observer.h"
12 #include "ash/system/tray/system_tray_delegate.h"
13 #include "ash/system/tray/system_tray_notifier.h" 13 #include "ash/system/tray/system_tray_notifier.h"
14 #include "ash/test/ash_interactive_ui_test_base.h" 14 #include "ash/test/ash_interactive_ui_test_base.h"
15 #include "ash/test/test_screenshot_delegate.h" 15 #include "ash/test/test_screenshot_delegate.h"
16 #include "ash/test/test_volume_control_delegate.h" 16 #include "ash/test/test_volume_control_delegate.h"
17 #include "ash/wm/window_state_aura.h" 17 #include "ash/wm/window_state_aura.h"
18 #include "ash/wm/window_util.h" 18 #include "ash/wm/window_util.h"
19 #include "base/run_loop.h" 19 #include "base/run_loop.h"
20 #include "chromeos/network/network_handler.h" 20 #include "chromeos/network/network_handler.h"
21 #include "ui/base/test/ui_controls.h" 21 #include "ui/base/test/ui_controls.h"
22 22
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) { 201 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
202 EXPECT_FALSE(shell()->GetAppListTargetVisibility()); 202 EXPECT_FALSE(shell()->GetAppListTargetVisibility());
203 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); 203 SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
204 EXPECT_TRUE(shell()->GetAppListTargetVisibility()); 204 EXPECT_TRUE(shell()->GetAppListTargetVisibility());
205 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); 205 SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
206 EXPECT_FALSE(shell()->GetAppListTargetVisibility()); 206 EXPECT_FALSE(shell()->GetAppListTargetVisibility());
207 } 207 }
208 208
209 } // namespace test 209 } // namespace test
210 } // namespace ash 210 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698