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

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: Add ash::wm::ToggleMaximizedWindow to window_util.h 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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
6
7 #include "ash/shell.h"
8 #include "ash/shell_delegate.h"
9 #include "ash/wm/window_util.h"
10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_commands.h"
12 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/test/base/in_process_browser_test.h"
14
15 typedef InProcessBrowserTest ChromeShellDelegateBrowserTest;
16
17 // Confirm that toggling window miximized works properly
18 IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) {
19 ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
20 ASSERT_TRUE(shell_delegate);
21
22 // When not in fullscreen, ShellDelegate::ToggleMaximized toggles Maximized.
23 aura::Window* window = ash::wm::GetActiveWindow();
24 EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
25 shell_delegate->ToggleMaximized();
26 EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
27 shell_delegate->ToggleMaximized();
28 EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
29
30 // When in fullscreen ShellDelegate::ToggleMaximized gets out of fullscreen.
31 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
32 Browser* browser = browser::FindBrowserWithWindow(window);
33 ASSERT_TRUE(browser);
34 chrome::ToggleFullscreenMode(browser);
35 EXPECT_TRUE(ash::wm::IsWindowFullscreen(window));
36 shell_delegate->ToggleMaximized();
37 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
38 EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
39 shell_delegate->ToggleMaximized();
40 EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
41 EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
42 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/chrome_shell_delegate.cc ('k') | chrome/browser/ui/views/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698