Fixing many problems around the maximize bubble

ash/wm/workspace/frame_maximize_button.h

 // 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.
 
 #ifndef ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_
 #define ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_
 
 #include "ash/ash_export.h"
 #include "ash/wm/workspace/snap_types.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 78 matching lines @@
   // |update_timer_|.
   void UpdateSnapFromEventLocation();
 
   // Updates |snap_type_| based on a mouse drag.
   void UpdateSnap(const gfx::Point& location);
 
   // Returns the type of snap based on the specified location.
   SnapType SnapTypeForLocation(const gfx::Point& location) const;
 
   // Returns the bounds of the resulting window for the specified type.
-  gfx::Rect ScreenBoundsForType(SnapType type) const;
+  gfx::Rect ScreenBoundsForType(SnapType type,
+                                internal::SnapSizer* snap_sizer) const;

[sky, 2012/08/08 17:26:01]

Make this and Snap take a const SnapSizer& (and remove your DCHECK in
ScreenBoundsForType).

[Mr4D (OOO till 08-26), 2012/08/08 17:50:51]

Done.

 
   // Converts location to screen coordinates and returns it. These are the
   // coordinates used by the SnapSizer.
   gfx::Point LocationForSnapSizer(const gfx::Point& location) const;
 
   // Snaps the window to the current snap position.
-  void Snap();
+  void Snap(internal::SnapSizer* snap_sizer);
 
   // Frame that the maximize button acts on.
   views::NonClientFrameView* frame_;
 
   // Renders the snap position.
   scoped_ptr<internal::PhantomWindowController> phantom_window_;
 
   // Is snapping enabled? Set on press so that in drag we know whether we
   // should show the snap locations.
   bool is_snap_enabled_;
@@ skipping 17 matching lines @@
   base::OneShotTimer<FrameMaximizeButton> update_timer_;
 
   scoped_ptr<MaximizeBubbleController> maximizer_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameMaximizeButton);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_WORKSPACE_FRAME_MAXIMIZE_BUTTON_H_