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

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

Issue 2729363002: chromeos: Move files in //ash/common to //ash, part 3 (Closed)
Patch Set: Created 3 years, 9 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
OLDNEW
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 "ui/wm/core/accelerator_filter.h" 5 #include "ui/wm/core/accelerator_filter.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "ash/accelerators/accelerator_controller.h" 9 #include "ash/accelerators/accelerator_controller.h"
10 #include "ash/accelerators/accelerator_delegate.h" 10 #include "ash/accelerators/accelerator_delegate.h"
11 #include "ash/common/wm_shell.h"
12 #include "ash/public/cpp/shell_window_ids.h" 11 #include "ash/public/cpp/shell_window_ids.h"
13 #include "ash/shell.h" 12 #include "ash/shell.h"
14 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
15 #include "ash/test/ash_test_helper.h" 14 #include "ash/test/ash_test_helper.h"
16 #include "ash/test/test_screenshot_delegate.h" 15 #include "ash/test/test_screenshot_delegate.h"
17 #include "ash/test/test_session_state_delegate.h" 16 #include "ash/test/test_session_state_delegate.h"
18 #include "ash/wm/window_state.h" 17 #include "ash/wm/window_state.h"
19 #include "ash/wm/window_state_aura.h" 18 #include "ash/wm/window_state_aura.h"
20 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
20 #include "ash/wm_shell.h"
21 #include "testing/gtest/include/gtest/gtest.h" 21 #include "testing/gtest/include/gtest/gtest.h"
22 #include "ui/aura/client/aura_constants.h" 22 #include "ui/aura/client/aura_constants.h"
23 #include "ui/aura/test/aura_test_base.h" 23 #include "ui/aura/test/aura_test_base.h"
24 #include "ui/aura/test/test_windows.h" 24 #include "ui/aura/test/test_windows.h"
25 #include "ui/aura/window.h" 25 #include "ui/aura/window.h"
26 #include "ui/base/accelerators/accelerator_history.h" 26 #include "ui/base/accelerators/accelerator_history.h"
27 #include "ui/events/event.h" 27 #include "ui/events/event.h"
28 #include "ui/events/test/event_generator.h" 28 #include "ui/events/test/event_generator.h"
29 #include "ui/gfx/geometry/rect.h" 29 #include "ui/gfx/geometry/rect.h"
30 30
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN); 178 window->SetProperty(aura::client::kShowStateKey, ui::SHOW_STATE_FULLSCREEN);
179 generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN); 179 generator.PressKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
180 generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN); 180 generator.ReleaseKey(ui::VKEY_L, ui::EF_COMMAND_DOWN);
181 EXPECT_TRUE(session_state_delegate->IsScreenLocked()); 181 EXPECT_TRUE(session_state_delegate->IsScreenLocked());
182 UnblockUserSession(); 182 UnblockUserSession();
183 EXPECT_FALSE(session_state_delegate->IsScreenLocked()); 183 EXPECT_FALSE(session_state_delegate->IsScreenLocked());
184 } 184 }
185 185
186 } // namespace test 186 } // namespace test
187 } // namespace ash 187 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_delegate.cc ('k') | ash/accelerators/accelerator_interactive_uitest_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698