[Cleanup] Rename WindowSettings to WindowState

chrome/browser/sessions/session_restore.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 "chrome/browser/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
@@ skipping 41 matching lines @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #endif
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif
 
 #if defined(USE_ASH)
-#include "ash/wm/window_settings.h"
+#include "ash/wm/window_state.h"
 #endif
 using content::NavigationController;
 using content::RenderWidgetHost;
 using content::WebContents;
 
 namespace {
 
 class SessionRestoreImpl;
 class TabLoader;
 
@@ skipping 1007 matching lines @@
   void ShowBrowser(Browser* browser, int selected_tab_index) {
     DCHECK(browser);
     DCHECK(browser->tab_strip_model()->count());
     browser->tab_strip_model()->ActivateTabAt(selected_tab_index, true);
 
     if (browser_ == browser)
       return;
 
 #if defined(USE_ASH)
     // Prevent the auto window management for this window on show.
-    ash::wm::GetWindowSettings(browser->window()->GetNativeWindow())->
+    ash::wm::GetWindowState(browser->window()->GetNativeWindow())->
         set_bounds_changed_by_user(true);
 #endif
     browser->window()->Show();
 #if defined(USE_ASH)
-    ash::wm::GetWindowSettings(browser->window()->GetNativeWindow())->
+    ash::wm::GetWindowState(browser->window()->GetNativeWindow())->
         set_bounds_changed_by_user(false);
 #endif
     browser->set_is_session_restore(false);
 
     // TODO(jcampan): http://crbug.com/8123 we should not need to set the
     //                initial focus explicitly.
     browser->tab_strip_model()->GetActiveWebContents()->
         GetView()->SetInitialFocus();
 
     if (!browser_shown_) {
@@ skipping 161 matching lines @@
   if (!active_session_restorers)
     return false;
   for (std::set<SessionRestoreImpl*>::const_iterator it =
            active_session_restorers->begin();
        it != active_session_restorers->end(); ++it) {
     if ((*it)->synchronous())
       return true;
   }
   return false;
 }