| 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/accelerators/accelerator_commands.h" | 5 #include "ash/accelerators/accelerator_commands.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 | 8 |
| 9 #include "ash/test/ash_test_base.h" | 9 #include "ash/test/ash_test_base.h" |
| 10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| 11 #include "ash/wm/window_state_aura.h" |
| 11 #include "ui/aura/window.h" | 12 #include "ui/aura/window.h" |
| 12 | 13 |
| 13 // Note: The unit tests for |ToggleMaximized()| and | 14 // Note: The unit tests for |ToggleMaximized()| and |
| 14 // |ToggleFullscreen()| are in | 15 // |ToggleFullscreen()| are in |
| 15 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc. | 16 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc. |
| 16 // because they depends on chrome implementation of | 17 // because they depends on chrome implementation of |
| 17 // |ash::wm::WindowStateDelegate|. | 18 // |ash::wm::WindowStateDelegate|. |
| 18 | 19 |
| 19 namespace ash { | 20 namespace ash { |
| 20 namespace accelerators { | 21 namespace accelerators { |
| (...skipping 23 matching lines...) Expand all Loading... |
| 44 // Toggling minimize when there are no active windows should unminimize and | 45 // Toggling minimize when there are no active windows should unminimize and |
| 45 // activate the last active window. | 46 // activate the last active window. |
| 46 ToggleMinimized(); | 47 ToggleMinimized(); |
| 47 EXPECT_FALSE(window_state1->IsMinimized()); | 48 EXPECT_FALSE(window_state1->IsMinimized()); |
| 48 EXPECT_TRUE(window_state1->IsNormalStateType()); | 49 EXPECT_TRUE(window_state1->IsNormalStateType()); |
| 49 EXPECT_TRUE(window_state1->IsActive()); | 50 EXPECT_TRUE(window_state1->IsActive()); |
| 50 } | 51 } |
| 51 | 52 |
| 52 } // namespace accelerators | 53 } // namespace accelerators |
| 53 } // namespace ash | 54 } // namespace ash |
| OLD | NEW |