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

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

Issue 1890713002: Adds WmWindow and converts WindowState to use it (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge again Created 4 years, 8 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_filter_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/shell.h" 7 #include "ash/shell.h"
8 #include "ash/shell_observer.h" 8 #include "ash/shell_observer.h"
9 #include "ash/system/chromeos/network/network_observer.h" 9 #include "ash/system/chromeos/network/network_observer.h"
10 #include "ash/system/tray/system_tray_delegate.h" 10 #include "ash/system/tray/system_tray_delegate.h"
11 #include "ash/system/tray/system_tray_notifier.h" 11 #include "ash/system/tray/system_tray_notifier.h"
12 #include "ash/test/ash_interactive_ui_test_base.h" 12 #include "ash/test/ash_interactive_ui_test_base.h"
13 #include "ash/test/test_screenshot_delegate.h" 13 #include "ash/test/test_screenshot_delegate.h"
14 #include "ash/test/test_volume_control_delegate.h" 14 #include "ash/test/test_volume_control_delegate.h"
15 #include "ash/wm/window_state.h" 15 #include "ash/wm/window_state.h"
16 #include "ash/wm/window_state_aura.h"
16 #include "ash/wm/window_util.h" 17 #include "ash/wm/window_util.h"
17 #include "base/run_loop.h" 18 #include "base/run_loop.h"
18 #include "chromeos/network/network_handler.h" 19 #include "chromeos/network/network_handler.h"
19 #include "ui/base/test/ui_controls.h" 20 #include "ui/base/test/ui_controls.h"
20 21
21 namespace ash { 22 namespace ash {
22 namespace test { 23 namespace test {
23 24
24 namespace { 25 namespace {
25 26
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) { 200 TEST_F(AcceleratorInteractiveUITest, MAYBE_ToggleAppList) {
200 EXPECT_FALSE(shell()->GetAppListTargetVisibility()); 201 EXPECT_FALSE(shell()->GetAppListTargetVisibility());
201 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); 202 SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
202 EXPECT_TRUE(shell()->GetAppListTargetVisibility()); 203 EXPECT_TRUE(shell()->GetAppListTargetVisibility());
203 SendKeyPressSync(ui::VKEY_LWIN, false, false, false); 204 SendKeyPressSync(ui::VKEY_LWIN, false, false, false);
204 EXPECT_FALSE(shell()->GetAppListTargetVisibility()); 205 EXPECT_FALSE(shell()->GetAppListTargetVisibility());
205 } 206 }
206 207
207 } // namespace test 208 } // namespace test
208 } // namespace ash 209 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_filter_unittest.cc ('k') | ash/ash.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698