[Cleanup] Rename WindowSettings to WindowState

ash/wm/frame_painter_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/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "grit/ash_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/font.h"
@@ skipping 450 matching lines @@
 
   // Moves the w3 to the secondary display too.  Now w1 should be solo again.
   w3->SetBounds(gfx::Rect(1200, 0, 100, 100));
   EXPECT_TRUE(p1->UseSoloWindowHeader());
   EXPECT_FALSE(p2->UseSoloWindowHeader());
   EXPECT_FALSE(p3->UseSoloWindowHeader());
   EXPECT_FALSE(p4->UseSoloWindowHeader());
   EXPECT_TRUE(checker1.IsPaintScheduledAndReset());
 
   // Change the w3 state to maximize.  Doesn't affect to w1.
-  wm::MaximizeWindow(w3->GetNativeWindow());
+  wm::GetWindowState(w3->GetNativeWindow())->Maximize();
   EXPECT_TRUE(p1->UseSoloWindowHeader());
   EXPECT_FALSE(p2->UseSoloWindowHeader());
   EXPECT_FALSE(p3->UseSoloWindowHeader());
   EXPECT_FALSE(p4->UseSoloWindowHeader());
 
   // Close the w3 and w4.
   w3.reset();
   w4.reset();
   EXPECT_TRUE(p1->UseSoloWindowHeader());
   EXPECT_TRUE(p2->UseSoloWindowHeader());
@@ skipping 39 matching lines @@
                                  IDR_AURA_WINDOW_HEADER_BASE_ACTIVE,
                                  0));
 
   // Inactive window has inactive window opacity.
   EXPECT_EQ(FramePainter::kInactiveWindowOpacity,
             p2->GetHeaderOpacity(FramePainter::INACTIVE,
                                  IDR_AURA_WINDOW_HEADER_BASE_INACTIVE,
                                  0));
 
   // Regular maximized windows are fully opaque.
-  ash::wm::MaximizeWindow(w1->GetNativeWindow());
+  wm::GetWindowState(w1->GetNativeWindow())->Maximize();
   EXPECT_EQ(255,
             p1->GetHeaderOpacity(FramePainter::ACTIVE,
                                  IDR_AURA_WINDOW_HEADER_BASE_ACTIVE,
                                  0));
 }
 
 // Test that the minimal header style is used in the proper situations.
 TEST_F(FramePainterTest, MinimalHeaderStyle) {
   // Create a widget and a painter for it.
   scoped_ptr<Widget> w(CreateTestWidget());
   scoped_ptr<FramePainter> p(CreateTestPainter(w.get()));
   w->Show();
 
   // Regular non-maximized windows should not use the minimal header style.
   EXPECT_FALSE(p->ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO));
 
   // Regular maximized windows should use the minimal header style.
   w->Maximize();
   EXPECT_TRUE(p->ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO));
 
   // Test cases where the maximized window should not use the minimal header
   // style.
   EXPECT_FALSE(p->ShouldUseMinimalHeaderStyle(FramePainter::THEMED_YES));
 
-  wm::GetWindowSettings(w->GetNativeWindow())->SetTrackedByWorkspace(false);
+  wm::GetWindowState(w->GetNativeWindow())->SetTrackedByWorkspace(false);
   EXPECT_FALSE(p->ShouldUseMinimalHeaderStyle(FramePainter::THEMED_NO));
-  wm::GetWindowSettings(w->GetNativeWindow())->SetTrackedByWorkspace(true);
+  wm::GetWindowState(w->GetNativeWindow())->SetTrackedByWorkspace(true);
 }
 
 // Ensure the title text is vertically aligned with the window icon.
 TEST_F(FramePainterTest, TitleIconAlignment) {
   scoped_ptr<Widget> w(CreateTestWidget());
   FramePainter p;
   ash::FrameCaptionButtonContainerView container(w.get(),
       ash::FrameCaptionButtonContainerView::MINIMIZE_ALLOWED);
   views::View window_icon;
   window_icon.SetBounds(0, 0, 16, 16);
@@ skipping 71 matching lines @@
   FramePainterOwner* o2 = new FramePainterOwner(w2);
   FramePainter* p2 = o2->frame_painter();
   w2->Show();
   EXPECT_FALSE(p1->UseSoloWindowHeader());
   EXPECT_FALSE(p2->UseSoloWindowHeader());
 
   // Exit with no resource release. They'll be released at shutdown.
 }
 
 }  // namespace ash