[Cleanup] Rename WindowSettings to WindowState

chrome/browser/ui/views/apps/native_app_window_views.cc

 // Copyright 2013 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 "chrome/browser/ui/views/apps/native_app_window_views.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 26 matching lines @@
 
 #if defined(OS_LINUX)
 #include "chrome/browser/shell_integration_linux.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/panels/panel_frame_view.h"
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #endif
 
 using apps::ShellWindow;
 
 namespace {
 
@@ skipping 220 matching lines @@
   window_->Init(params);
   window_->set_focus_on_creation(create_params.focused);
 
 #if defined(USE_ASH)
   if (create_params.state == ui::SHOW_STATE_DETACHED) {
     gfx::Rect window_bounds(create_params.bounds.x(),
                             create_params.bounds.y(),
                             preferred_size_.width(),
                             preferred_size_.height());
     aura::Window* native_window = GetNativeWindow();
-    ash::wm::GetWindowSettings(native_window)->set_panel_attached(false);
+    ash::wm::GetWindowState(native_window)->set_panel_attached(false);
     native_window->SetDefaultParentByRootWindow(
         native_window->GetRootWindow(), native_window->GetBoundsInScreen());
     window_->SetBounds(window_bounds);
   }
 #else
   // TODO(stevenjb): NativeAppWindow panels need to be implemented for other
   // platforms.
 #endif
 }
 
@@ skipping 106 matching lines @@
 }
 
 void NativeAppWindowViews::FlashFrame(bool flash) {
   window_->FlashFrame(flash);
 }
 
 bool NativeAppWindowViews::IsAlwaysOnTop() const {
   if (!shell_window_->window_type_is_panel())
     return false;
 #if defined(USE_ASH)
-  return ash::wm::GetWindowSettings(window_->GetNativeWindow())->
+  return ash::wm::GetWindowState(window_->GetNativeWindow())->
       panel_attached();
 #else
   return true;
 #endif
 }
 
 gfx::Insets NativeAppWindowViews::GetFrameInsets() const {
   if (frameless())
     return gfx::Insets();
 
@@ skipping 317 matching lines @@
 }
 
 bool NativeAppWindowViews::IsFullscreenOrPending() const {
   return is_fullscreen_;
 }
 
 bool NativeAppWindowViews::IsDetached() const {
   if (!shell_window_->window_type_is_panel())
     return false;
 #if defined(USE_ASH)
-  return !ash::wm::GetWindowSettings(window_->GetNativeWindow())->
-      panel_attached();
+  return !ash::wm::GetWindowState(window_->GetNativeWindow())->panel_attached();
 #else
   return false;
 #endif
 }
 
 views::View* NativeAppWindowViews::GetContentsView() {
   return this;
 }
 
 void NativeAppWindowViews::UpdateWindowIcon() {
@@ skipping 20 matching lines @@
 
 void NativeAppWindowViews::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   unhandled_keyboard_event_handler_.HandleKeyboardEvent(event,
                                                         GetFocusManager());
 }
 
 void NativeAppWindowViews::RenderViewHostChanged() {
   OnViewWasResized();
 }