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

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

Issue 1921353002: Moves handful of files to ash/wm/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shell_ids
Patch Set: merge to trunk Created 4 years, 7 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_commands.cc ('k') | ash/accelerators/accelerator_controller.cc » ('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 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/common/window_state.h"
11 #include "ash/wm/window_state_aura.h" 11 #include "ash/wm/window_state_aura.h"
12 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
13 13
14 // Note: The unit tests for |ToggleMaximized()| and 14 // Note: The unit tests for |ToggleMaximized()| and
15 // |ToggleFullscreen()| are in 15 // |ToggleFullscreen()| are in
16 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc. 16 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc.
17 // because they depends on chrome implementation of 17 // because they depends on chrome implementation of
18 // |ash::wm::WindowStateDelegate|. 18 // |ash::wm::WindowStateDelegate|.
19 19
20 namespace ash { 20 namespace ash {
(...skipping 24 matching lines...) Expand all
45 // Toggling minimize when there are no active windows should unminimize and 45 // Toggling minimize when there are no active windows should unminimize and
46 // activate the last active window. 46 // activate the last active window.
47 ToggleMinimized(); 47 ToggleMinimized();
48 EXPECT_FALSE(window_state1->IsMinimized()); 48 EXPECT_FALSE(window_state1->IsMinimized());
49 EXPECT_TRUE(window_state1->IsNormalStateType()); 49 EXPECT_TRUE(window_state1->IsNormalStateType());
50 EXPECT_TRUE(window_state1->IsActive()); 50 EXPECT_TRUE(window_state1->IsActive());
51 } 51 }
52 52
53 } // namespace accelerators 53 } // namespace accelerators
54 } // namespace ash 54 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_commands.cc ('k') | ash/accelerators/accelerator_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698