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

Unified Diff: ash/wm/default_window_resizer.cc

Issue 24108003: [Cleanup] Rename WindowSettings to WindowState (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase fix Created 7 years, 3 months 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
Index: ash/wm/default_window_resizer.cc
diff --git a/ash/wm/default_window_resizer.cc b/ash/wm/default_window_resizer.cc
index a7b54e58d84f937d2358c89eddef19d6c9454cb8..41bc1fdd328f772e1825d427b5e6a8fc04d5a83b 100644
--- a/ash/wm/default_window_resizer.cc
+++ b/ash/wm/default_window_resizer.cc
@@ -5,7 +5,7 @@
#include "ash/wm/default_window_resizer.h"
#include "ash/shell.h"
-#include "ash/wm/property_util.h"
+#include "ash/wm/window_state.h"
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
@@ -34,7 +34,7 @@ void DefaultWindowResizer::Drag(const gfx::Point& location, int event_flags) {
gfx::Rect bounds(CalculateBoundsForDrag(details_, location));
if (bounds != details_.window->bounds()) {
if (!did_move_or_resize_ && !details_.restore_bounds.IsEmpty())
- ClearRestoreBounds(details_.window);
+ wm::GetWindowState(details_.window)->ClearRestoreBounds();
did_move_or_resize_ = true;
details_.window->SetBounds(bounds);
}
@@ -50,7 +50,8 @@ void DefaultWindowResizer::RevertDrag() {
details_.window->SetBounds(details_.initial_bounds_in_parent);
if (!details_.restore_bounds.IsEmpty())
- SetRestoreBoundsInScreen(details_.window, details_.restore_bounds);
+ wm::GetWindowState(details_.window)->SetRestoreBoundsInScreen(
+ details_.restore_bounds);
}
aura::Window* DefaultWindowResizer::GetTarget() {
« no previous file with comments | « ash/wm/caption_buttons/frame_maximize_button_unittest.cc ('k') | ash/wm/dock/docked_window_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698