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

Side by Side Diff: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc

Issue 11082002: Remove TOGGLE_MAXIMIZED_* from Ash reserved actions list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix AcceleratorControllerTest.WindowSnap Created 8 years, 2 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
OLDNEW
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "ash/shell.h"
6 #include "ash/shell_delegate.h"
7 #include "ash/wm/window_util.h"
8 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
sky 2012/10/09 15:50:53 This should be the first include.
mazda 2012/10/09 20:50:33 Done.
9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/browser_finder.h"
12 #include "chrome/test/base/in_process_browser_test.h"
13
14 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest;
15
16 // Confirm that toggling window miximized works properly
17 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) {
18 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
19 ASSERT_TRUE(shell_delegate);
20
21 // When not in fullscreen, ShellDelegate::ToggleMaximized toggles Maximized.
22 aura::Window* window = ash::wm::GetActiveWindow();
23 EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
24 shell_delegate->ToggleMaximized();
25 EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
26 shell_delegate->ToggleMaximized();
27 EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
28
29 // When in fullscreen ShellDelegate::ToggleMaximized gets out of fullscreen.
30 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
31 Browser* browser = browser::FindBrowserWithWindow(window);
32 ASSERT_TRUE(browser);
33 chrome::ToggleFullscreenMode(browser);
34 EXPECT_TRUE(ash::wm::IsWindowFullscreen(window));
35 shell_delegate->ToggleMaximized();
36 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
37 EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
38 shell_delegate->ToggleMaximized();
39 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
40 EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
41 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698