Undocks window first before side-snapping bounds

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/root_window_controller.h"
 #include "ash/screen_ash.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_properties.h"
@@ skipping 40 matching lines @@
 
 void WindowState::SetDelegate(scoped_ptr<WindowStateDelegate> delegate) {
   DCHECK(!delegate_.get());
   delegate_ = delegate.Pass();
 }
 
 ui::WindowShowState WindowState::GetShowState() const {
   return window_->GetProperty(aura::client::kShowStateKey);
 }
 
+void WindowState::SetWindowShowType(WindowShowType window_show_type) {
+  window_show_type_ = window_show_type;

[pkotwicz, 2013/11/18 16:25:20]

SnapSizer actually calls WindowState::SnapWindow() so I do not think that we
need to add this method.

[varkha, 2013/11/20 00:11:13]

Done. Removed (in favor of sending notifications whenever window_show_type_
changes).

+  // TODO(oshima): Notify only when the state has changed.
+  // Doing so break a few tests now.
+  FOR_EACH_OBSERVER(
+      WindowStateObserver, observer_list_,
+      OnWindowShowTypeChanged(this, ToWindowShowType(GetShowState())));
+}
+
 bool WindowState::IsMinimized() const {
   return GetShowState() == ui::SHOW_STATE_MINIMIZED;
 }
 
 bool WindowState::IsMaximized() const {
   return GetShowState() == ui::SHOW_STATE_MAXIMIZED;
 }
 
 bool WindowState::IsFullscreen() const {
   return GetShowState() == ui::SHOW_STATE_FULLSCREEN;
@@ skipping 203 matching lines @@
     // changes occurs and the original restore bounds is remembered.
     gfx::Rect restore_bounds_in_screen =
         GetRestoreBoundsInScreen();
     SetRestoreBoundsInParent(bounds);
     Restore();
     SetRestoreBoundsInScreen(restore_bounds_in_screen);
   } else {
     window_->SetBounds(bounds);
   }
   DCHECK(left_or_right == SHOW_TYPE_LEFT_SNAPPED ||
          left_or_right == SHOW_TYPE_RIGHT_SNAPPED);

[pkotwicz, 2013/11/18 16:25:20]

Oshima-san, is there a reason why we do not notify observers about the state
change here?

[oshima, 2013/11/18 18:44:44]

No specific reason other than LEFT/RIGHT SNAPPED state hasn't been fully
implemented yet. Let's try and fix side effects if any.

[varkha, 2013/11/20 00:11:13]

Done. I am notifying first to allow observers to take any action necessary
before setting bounds. This allows docked layout to undock the window when
snapped state is set.

   window_show_type_ = left_or_right;
 }
 
 WindowState* GetActiveWindowState() {
   aura::Window* active = GetActiveWindow();
   return active ? GetWindowState(active) : NULL;
 }
 
 WindowState* GetWindowState(aura::Window* window) {
   if (!window)
     return NULL;
   WindowState* settings = window->GetProperty(internal::kWindowStateKey);
   if(!settings) {
     settings = new WindowState(window);
     window->SetProperty(internal::kWindowStateKey, settings);
   }
   return settings;
 }
 
 const WindowState* GetWindowState(const aura::Window* window) {
   return GetWindowState(const_cast<aura::Window*>(window));
 }
 
 }  // namespace wm
 }  // namespace ash