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

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

Issue 181563004: Remove --ash-disable-overview-mode (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 6 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 | Annotate | Revision Log
« 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 "ash/test/ash_test_base.h" 7 #include "ash/test/ash_test_base.h"
8 #include "ash/wm/window_state.h" 8 #include "ash/wm/window_state.h"
9 #include "ui/aura/window.h" 9 #include "ui/aura/window.h"
10 10
11 // Note: The unit tests for |ToggleMaximized()| and 11 // Note: The unit tests for |ToggleMaximized()| and
12 // |ToggleFullscreen()| are in 12 // |ToggleFullscreen()| are in
13 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc. 13 // chrome/browser/ui/ash/accelerator_commands_browsertests.cc.
14 // because they depends on chrome implementation of 14 // because they depends on chrome implementation of
15 // |ash::wm::WindowStateDelegate|. 15 // |ash::wm::WindowStateDelegate|.
16 16
17 namespace ash { 17 namespace ash {
18 namespace accelerators { 18 namespace accelerators {
19 19
20 typedef test::AshTestBase AcceleratorCommandsTest; 20 typedef test::AshTestBase AcceleratorCommandsTest;
21 21
22 TEST_F(AcceleratorCommandsTest, ToggleMinimized) { 22 TEST_F(AcceleratorCommandsTest, ToggleMinimized) {
23 scoped_ptr<aura::Window> window( 23 scoped_ptr<aura::Window> window1(
24 CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20))); 24 CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
25 wm::WindowState* window_state = wm::GetWindowState(window.get()); 25 scoped_ptr<aura::Window> window2(
26 window_state->Activate(); 26 CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
27 wm::WindowState* window_state1 = wm::GetWindowState(window1.get());
28 wm::WindowState* window_state2 = wm::GetWindowState(window2.get());
29 window_state1->Activate();
30 window_state2->Activate();
27 31
28 ToggleMinimized(); 32 ToggleMinimized();
29 EXPECT_TRUE(window_state->IsMinimized()); 33 EXPECT_TRUE(window_state2->IsMinimized());
30 EXPECT_FALSE(window_state->IsNormalStateType()); 34 EXPECT_FALSE(window_state2->IsNormalStateType());
35 EXPECT_TRUE(window_state1->IsActive());
31 36
32 ToggleMinimized(); 37 ToggleMinimized();
33 EXPECT_FALSE(window_state->IsMinimized()); 38 EXPECT_TRUE(window_state1->IsMinimized());
34 EXPECT_TRUE(window_state->IsNormalStateType()); 39 EXPECT_FALSE(window_state1->IsNormalStateType());
40 EXPECT_FALSE(window_state1->IsActive());
41
42 // Toggling minimize when there are no active windows should unminimize and
43 // activate the last active window.
44 ToggleMinimized();
45 EXPECT_FALSE(window_state1->IsMinimized());
46 EXPECT_TRUE(window_state1->IsNormalStateType());
47 EXPECT_TRUE(window_state1->IsActive());
35 } 48 }
36 49
37 } // namespace accelerators 50 } // namespace accelerators
38 } // namespace ash 51 } // 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