Makes wm2 reset the bounds immediately after cloning the layer for

ash/wm/workspace/workspace_layout_manager2.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/workspace/workspace_layout_manager2.h"
 
 #include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/always_on_top_controller.h"
@@ skipping 35 matching lines @@
 void ResetBoundsIfNecessary(const BoundsMap& bounds_map, aura::Window* window) {
   if (window->bounds().IsEmpty() && window->GetTargetBounds().IsEmpty()) {
     BoundsMap::const_iterator i = bounds_map.find(window);
     if (i != bounds_map.end())
       window->SetBounds(i->second);
   }
   for (size_t i = 0; i < window->children().size(); ++i)
     ResetBoundsIfNecessary(bounds_map, window->children()[i]);
 }
 
+// Resets |window|s bounds from |bounds_map| if |window| is marked as a
+// constrained window. Recusively invokes this for all children.
+// TODO(sky): this should key off window type.
+void ResetConstrainedWindowBoundsIfNecessary(const BoundsMap& bounds_map,
+                                             aura::Window* window) {
+  if (window->GetProperty(aura::client::kConstrainedWindowKey)) {
+    BoundsMap::const_iterator i = bounds_map.find(window);

[Mr4D (OOO till 08-26), 2012/09/26 04:25:08]

It is a bit confusing to have to 'i' variables in one procedure which have so
different meaning.

[sky, 2012/09/26 04:51:15]

They have totally different scopes. It's no different than having two separate
for loops use 'i'.

+    if (i != bounds_map.end())
+      window->SetBounds(i->second);
+  }
+  for (size_t i = 0; i < window->children().size(); ++i)
+    ResetConstrainedWindowBoundsIfNecessary(bounds_map, window->children()[i]);
+}
+
 }  // namespace
 
 WorkspaceLayoutManager2::WorkspaceLayoutManager2(Workspace2* workspace)
     : root_window_(workspace->window()->GetRootWindow()),
       workspace_(workspace),
       work_area_(ScreenAsh::GetDisplayWorkAreaBoundsInParent(
                      workspace->window()->parent())) {
   Shell::GetInstance()->AddShellObserver(this);
   root_window_->AddRootWindowObserver(this);
   root_window_->AddObserver(this);
@@ skipping 103 matching lines @@
     ui::Layer* cloned_layer = NULL;
     BoundsMap bounds_map;
     if (wm::IsActiveWindow(window) &&
         ((WorkspaceManager2::IsMaximizedState(new_state) &&
           wm::IsWindowStateNormal(old_state)) ||
          (!WorkspaceManager2::IsMaximizedState(new_state) &&
           WorkspaceManager2::IsMaximizedState(old_state) &&
           new_state != ui::SHOW_STATE_MINIMIZED))) {
       BuildWindowBoundsMap(window, &bounds_map);
       cloned_layer = wm::RecreateWindowLayers(window, false);
+      // Constrained windows don't get their bounds reset when we update the
+      // window bounds. Leaving them empty is unexpected, so we reset them now.
+      ResetConstrainedWindowBoundsIfNecessary(bounds_map, window);
     }
     UpdateBoundsFromShowState(window);
 
     if (cloned_layer) {
       // Even though we just set the bounds not all descendants may have valid
       // bounds. For example, constrained windows don't resize with the parent.
       // Ensure that all windows that had a bounds before we cloned the layer
       // have a bounds now.
       ResetBoundsIfNecessary(bounds_map, window);
     }
@@ skipping 150 matching lines @@
   }
   return false;
 }
 
 WorkspaceManager2* WorkspaceLayoutManager2::workspace_manager() {
   return workspace_->workspace_manager();
 }
 
 }  // namespace internal
 }  // namespace ash