Make WindowState::CanMinimize() take into account WidgetDelegate::CanMinimize()

ash/wm/toplevel_window_event_handler_unittest.cc

 // 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/wm/toplevel_window_event_handler.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
-#include "ash/wm/lock_state_controller.h"
 #include "ash/wm/resize_shadow.h"
 #include "ash/wm/resize_shadow_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace_controller.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 439 matching lines @@
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
   EXPECT_NE(old_bounds.ToString(), target->bounds().ToString());
   EXPECT_TRUE(window_state->IsMinimized());
   EXPECT_TRUE(window_state->unminimize_to_restore_bounds());
   EXPECT_EQ(old_bounds.ToString(),
             window_state->GetRestoreBoundsInScreen().ToString());
 }
 
-// Tests that a gesture cannot minimize a window in login/lock screen.
-TEST_F(ToplevelWindowEventHandlerTest, GestureDragMinimizeLoginScreen) {
-  LockStateController* state_controller =
-      Shell::GetInstance()->lock_state_controller();
-  state_controller->OnLoginStateChanged(user::LOGGED_IN_NONE);
-  state_controller->OnLockStateChanged(false);
-  SetUserLoggedIn(false);
-
+// Tests that a gesture cannot minimize an unminimizeable window.
+TEST_F(ToplevelWindowEventHandlerTest,
+       GestureAttemptMinimizeUnminimizeableWindow) {
   scoped_ptr<aura::Window> target(CreateWindow(HTCAPTION));
-  aura::Window* lock =
-      RootWindowController::ForWindow(target.get())
-          ->GetContainer(kShellWindowId_LockSystemModalContainer);
-  lock->AddChild(target.get());
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow(),
                                      target.get());
   gfx::Rect old_bounds = target->bounds();
   gfx::Point location(5, 5);
   target->SetProperty(aura::client::kCanMaximizeKey, true);
+  target->SetProperty(aura::client::kCanMinimizeKey, false);
 
   gfx::Point end = location;
   end.Offset(0, 100);
   generator.GestureScrollSequence(location, end,
       base::TimeDelta::FromMilliseconds(5),
       10);
   RunAllPendingInMessageLoop();
   EXPECT_FALSE(wm::GetWindowState(target.get())->IsMinimized());
 }
 
@@ skipping 235 matching lines @@
   EXPECT_EQ(aura::client::MOVE_SUCCESSFUL,
             move_client->RunMoveLoop(window.get(), gfx::Vector2d(),
                 aura::client::WINDOW_MOVE_SOURCE_MOUSE));
 }
 
 // Showing the resize shadows when the mouse is over the window edges is tested
 // in resize_shadow_and_cursor_test.cc
 
 }  // namespace test
 }  // namespace ash