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

Side by Side Diff: ash/wm/drag_details.cc

Issue 169713003: Remove WindowState::IsNormalShowState() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/drag_details.h" 5 #include "ash/wm/drag_details.h"
6 6
7 #include "ash/wm/window_resizer.h" 7 #include "ash/wm/window_resizer.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/base/hit_test.h" 9 #include "ui/base/hit_test.h"
10 10
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 position_change_direction( 55 position_change_direction(
56 WindowResizer::GetPositionChangeDirectionForWindowComponent( 56 WindowResizer::GetPositionChangeDirectionForWindowComponent(
57 window_component)), 57 window_component)),
58 size_change_direction( 58 size_change_direction(
59 GetSizeChangeDirectionForWindowComponent(window_component)), 59 GetSizeChangeDirectionForWindowComponent(window_component)),
60 is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None), 60 is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None),
61 source(source), 61 source(source),
62 should_attach_to_shelf(window->type() == ui::wm::WINDOW_TYPE_PANEL && 62 should_attach_to_shelf(window->type() == ui::wm::WINDOW_TYPE_PANEL &&
63 wm::GetWindowState(window)->panel_attached()) { 63 wm::GetWindowState(window)->panel_attached()) {
64 wm::WindowState* window_state = wm::GetWindowState(window); 64 wm::WindowState* window_state = wm::GetWindowState(window);
65 if (window_state->IsNormalShowState() && 65 if (window_state->IsNormalOrSnapped() &&
66 window_state->HasRestoreBounds() && 66 window_state->HasRestoreBounds() &&
67 window_component == HTCAPTION) 67 window_component == HTCAPTION) {
68 restore_bounds = window_state->GetRestoreBoundsInScreen(); 68 restore_bounds = window_state->GetRestoreBoundsInScreen();
69 }
69 } 70 }
70 71
71 DragDetails::~DragDetails() { 72 DragDetails::~DragDetails() {
72 } 73 }
73 74
74 } // namespace ash 75 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/resize_shadow_and_cursor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698