OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_commands.h" | 5 #include "ash/accelerators/accelerator_commands.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "ash/accelerators/accelerator_commands_aura.h" | 9 #include "ash/accelerators/accelerator_commands_aura.h" |
10 #include "ash/common/wm/window_state.h" | |
11 #include "ash/test/ash_test_base.h" | 10 #include "ash/test/ash_test_base.h" |
| 11 #include "ash/wm/window_state.h" |
12 #include "ash/wm/window_state_aura.h" | 12 #include "ash/wm/window_state_aura.h" |
13 #include "ash/wm/window_util.h" | 13 #include "ash/wm/window_util.h" |
14 #include "ui/aura/window.h" | 14 #include "ui/aura/window.h" |
15 | 15 |
16 // Note: The unit tests for |ToggleMaximized()| and | 16 // Note: The unit tests for |ToggleMaximized()| and |
17 // |ToggleFullscreen()| are in | 17 // |ToggleFullscreen()| are in |
18 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc. | 18 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc. |
19 // because they depends on chrome implementation of | 19 // because they depends on chrome implementation of |
20 // |ash::wm::WindowStateDelegate|. | 20 // |ash::wm::WindowStateDelegate|. |
21 | 21 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 | 60 |
61 wm::PinWindow(window1.get(), /* trusted */ false); | 61 wm::PinWindow(window1.get(), /* trusted */ false); |
62 EXPECT_TRUE(window_state1->IsPinned()); | 62 EXPECT_TRUE(window_state1->IsPinned()); |
63 | 63 |
64 Unpin(); | 64 Unpin(); |
65 EXPECT_FALSE(window_state1->IsPinned()); | 65 EXPECT_FALSE(window_state1->IsPinned()); |
66 } | 66 } |
67 | 67 |
68 } // namespace accelerators | 68 } // namespace accelerators |
69 } // namespace ash | 69 } // namespace ash |
OLD | NEW |