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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..1c6285214a92a58431ca621745c54d51b9fc3836
--- /dev/null
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_browsertest.cc
@@ -0,0 +1,41 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ash/shell.h"
+#include "ash/shell_delegate.h"
+#include "ash/wm/window_util.h"
+#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.
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/test/base/in_process_browser_test.h"
+
+typedef InProcessBrowserTest ChromeShellDelegateBrowserTest;
+
+// Confirm that toggling window miximized works properly
+IN_PROC_BROWSER_TEST_F(ChromeShellDelegateBrowserTest, ToggleMaximized) {
+ ash::ShellDelegate* shell_delegate = ash::Shell::GetInstance()->delegate();
+ ASSERT_TRUE(shell_delegate);
+
+ // When not in fullscreen, ShellDelegate::ToggleMaximized toggles Maximized.
+ aura::Window* window = ash::wm::GetActiveWindow();
+ EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
+ shell_delegate->ToggleMaximized();
+ EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
+ shell_delegate->ToggleMaximized();
+ EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
+
+ // When in fullscreen ShellDelegate::ToggleMaximized gets out of fullscreen.
+ EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
+ Browser* browser = browser::FindBrowserWithWindow(window);
+ ASSERT_TRUE(browser);
+ chrome::ToggleFullscreenMode(browser);
+ EXPECT_TRUE(ash::wm::IsWindowFullscreen(window));
+ shell_delegate->ToggleMaximized();
+ EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
+ EXPECT_FALSE(ash::wm::IsWindowMaximized(window));
+ shell_delegate->ToggleMaximized();
+ EXPECT_FALSE(ash::wm::IsWindowFullscreen(window));
+ EXPECT_TRUE(ash::wm::IsWindowMaximized(window));
+}

Powered by Google App Engine
This is Rietveld 408576698