Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2371)

Unified Diff: ash/wm/workspace/frame_maximize_button.cc

Issue 11364052: Revert "Disabled WorkspaceWindowResizerTest.Edge since it got broken by https://chromiumcodereview.… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/window_resizer.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/frame_maximize_button.cc
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index 1e395de6a733bb9a03d411375ee1e5f348a5a278..9334a8e2bb9e4123c172c31d3e719fc5fa4c80fc 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -510,8 +510,8 @@ void FrameMaximizeButton::Snap(const SnapSizer& snap_sizer) {
switch (snap_type_) {
case SNAP_LEFT:
case SNAP_RIGHT: {
- // Get the bounds in screen coordinates for restore purposes.
- gfx::Rect restore = widget->GetWindowBoundsInScreen();
+ // Get the window coordinates on the screen for restore purposes.
+ gfx::Rect restore = widget->GetNativeWindow()->bounds();
if (widget->IsMaximized()) {
// In case of maximized we have a restore boundary.
DCHECK(ash::GetRestoreBoundsInScreen(widget->GetNativeWindow()));
@@ -533,8 +533,8 @@ void FrameMaximizeButton::Snap(const SnapSizer& snap_sizer) {
}
// Remember the widow's bounds for restoration.
ash::SetRestoreBoundsInScreen(widget->GetNativeWindow(), restore);
+ }
break;
- }
case SNAP_MAXIMIZE:
widget->Maximize();
break;
« no previous file with comments | « ash/wm/window_resizer.cc ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698