[Cleanup] Rename WindowSettings to WindowState

ash/test/test_shell_delegate.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/test/test_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/caps_lock_delegate_stub.h"
 #include "ash/host/root_window_host_factory.h"
 #include "ash/keyboard_controller_proxy_stub.h"
 #include "ash/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/test_launcher_delegate.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/logging.h"
 #include "content/public/test/test_browser_context.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"
 
 namespace ash {
 namespace test {
 
 TestShellDelegate::TestShellDelegate()
@@ skipping 32 matching lines @@
   num_exit_requests_++;
 }
 
 void TestShellDelegate::NewTab() {
 }
 
 void TestShellDelegate::NewWindow(bool incognito) {
 }
 
 void TestShellDelegate::ToggleMaximized() {
-  aura::Window* window = ash::wm::GetActiveWindow();
-  if (window)
-    ash::wm::ToggleMaximizedWindow(window);
+  wm::WindowState* window_state = wm::GetActiveWindowState();

[James Cook, 2013/09/18 20:44:17]

nit: Are you sure you want to provide GetActiveWindowState(), which does two
actions in one call?  I don't think it would be that bad to keep
GetActiveWindow() and call window->GetWindowState()->ToggleMaximized().

[oshima, 2013/09/19 01:52:01]

I added because most cases you get active window, you ends up getting
window_state.

+  if (window_state)
+    window_state->ToggleMaximized();
 }
 
 void TestShellDelegate::ToggleFullscreen() {
 }
 
 void TestShellDelegate::OpenFileManager(bool as_dialog) {
 }
 
 void TestShellDelegate::OpenCrosh() {
 }
@@ skipping 133 matching lines @@
 base::string16 TestShellDelegate::GetProductName() const {
   return base::string16();
 }
 
 TestSessionStateDelegate* TestShellDelegate::test_session_state_delegate() {
   return test_session_state_delegate_;
 }
 
 }  // namespace test
 }  // namespace ash