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

Side by Side Diff: ash/wm/default_window_resizer.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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ash/wm/window_resizer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/default_window_resizer.h" 5 #include "ash/wm/default_window_resizer.h"
6 6
7 #include "ash/shell.h" 7 #include "ash/shell.h"
8 #include "ash/wm/cursor_manager.h" 8 #include "ash/wm/cursor_manager.h"
9 #include "ash/wm/property_util.h" 9 #include "ash/wm/property_util.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 29 matching lines...) Expand all
40 } 40 }
41 } 41 }
42 42
43 void DefaultWindowResizer::CompleteDrag(int event_flags) { 43 void DefaultWindowResizer::CompleteDrag(int event_flags) {
44 } 44 }
45 45
46 void DefaultWindowResizer::RevertDrag() { 46 void DefaultWindowResizer::RevertDrag() {
47 if (!did_move_or_resize_) 47 if (!did_move_or_resize_)
48 return; 48 return;
49 49
50 details_.window->SetBounds(details_.initial_bounds_in_parent); 50 details_.window->SetBounds(details_.initial_bounds);
51 51
52 if (!details_.restore_bounds.IsEmpty()) 52 if (!details_.restore_bounds.IsEmpty())
53 SetRestoreBoundsInScreen(details_.window, details_.restore_bounds); 53 SetRestoreBoundsInScreen(details_.window, details_.restore_bounds);
54 } 54 }
55 55
56 aura::Window* DefaultWindowResizer::GetTarget() { 56 aura::Window* DefaultWindowResizer::GetTarget() {
57 return details_.window; 57 return details_.window;
58 } 58 }
59 59
60 DefaultWindowResizer::DefaultWindowResizer(const Details& details) 60 DefaultWindowResizer::DefaultWindowResizer(const Details& details)
61 : details_(details), 61 : details_(details),
62 did_move_or_resize_(false) { 62 did_move_or_resize_(false) {
63 DCHECK(details_.is_resizable); 63 DCHECK(details_.is_resizable);
64 ash::Shell::GetInstance()->cursor_manager()->LockCursor(); 64 ash::Shell::GetInstance()->cursor_manager()->LockCursor();
65 } 65 }
66 66
67 } // namespace aura 67 } // namespace aura
OLDNEW
« no previous file with comments | « no previous file | ash/wm/window_resizer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698