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

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

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 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
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/common/wm/drag_details.h" 5 #include "ash/common/wm/drag_details.h"
6 6
7 #include "ash/common/wm/window_resizer.h" 7 #include "ash/common/wm/window_resizer.h"
8 #include "ash/common/wm_window.h" 8 #include "ash/common/wm_window.h"
9 #include "ash/common/wm_window_property.h" 9 #include "ash/common/wm_window_property.h"
10 #include "ui/base/hit_test.h" 10 #include "ui/base/hit_test.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 WindowResizer::GetPositionChangeDirectionForWindowComponent( 61 WindowResizer::GetPositionChangeDirectionForWindowComponent(
62 window_component)), 62 window_component)),
63 size_change_direction( 63 size_change_direction(
64 GetSizeChangeDirectionForWindowComponent(window_component)), 64 GetSizeChangeDirectionForWindowComponent(window_component)),
65 is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None), 65 is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None),
66 source(source), 66 source(source),
67 should_attach_to_shelf( 67 should_attach_to_shelf(
68 window->GetType() == ui::wm::WINDOW_TYPE_PANEL && 68 window->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
69 window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED)) { 69 window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED)) {
70 wm::WindowState* window_state = window->GetWindowState(); 70 wm::WindowState* window_state = window->GetWindowState();
71 if ((window_state->IsNormalOrSnapped() || window_state->IsDocked()) && 71 if (window_state->IsNormalOrSnapped() && window_state->HasRestoreBounds() &&
72 window_state->HasRestoreBounds() && window_component == HTCAPTION) { 72 window_component == HTCAPTION) {
73 restore_bounds = window_state->GetRestoreBoundsInScreen(); 73 restore_bounds = window_state->GetRestoreBoundsInScreen();
74 } 74 }
75 } 75 }
76 76
77 DragDetails::~DragDetails() {} 77 DragDetails::~DragDetails() {}
78 78
79 } // namespace ash 79 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698