ash: Make wm::WindowState's c'tor private.

ash/wm/window_state.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 "ash/wm/window_state.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell_window_ids.h"
@@ skipping 63 matching lines @@
     case ui::SHOW_STATE_DETACHED:
     case ui::SHOW_STATE_END:
       NOTREACHED() << "No WMEvent defined for the show state:"
                    << requested_show_state;
   }
   return WM_EVENT_NORMAL;
 }
 
 }  // namespace
 
-WindowState::WindowState(aura::Window* window)
-    : window_(window),
-      window_position_managed_(false),
-      bounds_changed_by_user_(false),
-      panel_attached_(true),
-      ignored_by_shelf_(false),
-      can_consume_system_keys_(false),
-      top_row_keys_are_function_keys_(false),
-      unminimize_to_restore_bounds_(false),
-      in_immersive_fullscreen_(false),
-      hide_shelf_when_fullscreen_(true),
-      minimum_visibility_(false),
-      can_be_dragged_(true),
-      ignore_property_change_(false),
-      current_state_(new DefaultState(ToWindowStateType(GetShowState()))) {
-  window_->AddObserver(this);
-}
-
 WindowState::~WindowState() {
   // WindowState is registered as an owned property of |window_|, and window
   // unregisters all of its observers in its d'tor before destroying its
   // properties. As a result, window_->RemoveObserver() doesn't need to (and
   // shouldn't) be called here.
 }
 
 bool WindowState::HasDelegate() const {
   return delegate_;
 }
@@ skipping 197 matching lines @@
 void WindowState::OnWindowPropertyChanged(aura::Window* window,
                                           const void* key,
                                           intptr_t old) {
   DCHECK_EQ(window, window_);
   if (key == aura::client::kShowStateKey && !ignore_property_change_) {
     WMEvent event(WMEventTypeFromShowState(GetShowState()));
     OnWMEvent(&event);
   }
 }
 
+WindowState::WindowState(aura::Window* window)
+    : window_(window),
+      window_position_managed_(false),
+      bounds_changed_by_user_(false),
+      panel_attached_(true),
+      ignored_by_shelf_(false),
+      can_consume_system_keys_(false),
+      top_row_keys_are_function_keys_(false),
+      unminimize_to_restore_bounds_(false),
+      in_immersive_fullscreen_(false),
+      hide_shelf_when_fullscreen_(true),
+      minimum_visibility_(false),
+      can_be_dragged_(true),
+      ignore_property_change_(false),
+      current_state_(new DefaultState(ToWindowStateType(GetShowState()))) {
+  window_->AddObserver(this);
+}
+
+ui::WindowShowState WindowState::GetShowState() const {
+  return window_->GetProperty(aura::client::kShowStateKey);
+}
+
 void WindowState::SetBoundsInScreen(
     const gfx::Rect& bounds_in_screen) {
   gfx::Rect bounds_in_parent =
       ScreenUtil::ConvertRectFromScreen(window_->parent(),
                                        bounds_in_screen);
   window_->SetBounds(bounds_in_parent);
 }
 
-ui::WindowShowState WindowState::GetShowState() const {
-  return window_->GetProperty(aura::client::kShowStateKey);
-}
-
 void WindowState::AdjustSnappedBounds(gfx::Rect* bounds) {
   if (is_dragged() || !IsSnapped())
     return;
   gfx::Rect maximized_bounds = ScreenUtil::GetMaximizedWindowBoundsInParent(
       window_);
   if (GetStateType() == WINDOW_STATE_TYPE_LEFT_SNAPPED)
     bounds->set_x(maximized_bounds.x());
   else if (GetStateType() == WINDOW_STATE_TYPE_RIGHT_SNAPPED)
     bounds->set_x(maximized_bounds.right() - bounds->width());
   bounds->set_y(maximized_bounds.y());
@@ skipping 109 matching lines @@
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash