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

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

Issue 2731663002: Remove WmWindowProperty (Closed)
Patch Set: rebase Created 3 years, 9 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/public/cpp/window_properties.h"
10 #include "ui/aura/window.h"
10 #include "ui/base/hit_test.h" 11 #include "ui/base/hit_test.h"
11 #include "ui/compositor/layer.h" 12 #include "ui/compositor/layer.h"
12 13
13 namespace ash { 14 namespace ash {
14 15
15 namespace { 16 namespace {
16 17
17 int GetSizeChangeDirectionForWindowComponent(int window_component) { 18 int GetSizeChangeDirectionForWindowComponent(int window_component) {
18 int size_change_direction = WindowResizer::kBoundsChangeDirection_None; 19 int size_change_direction = WindowResizer::kBoundsChangeDirection_None;
19 switch (window_component) { 20 switch (window_component) {
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 WindowResizer::GetBoundsChangeForWindowComponent(window_component)), 60 WindowResizer::GetBoundsChangeForWindowComponent(window_component)),
60 position_change_direction( 61 position_change_direction(
61 WindowResizer::GetPositionChangeDirectionForWindowComponent( 62 WindowResizer::GetPositionChangeDirectionForWindowComponent(
62 window_component)), 63 window_component)),
63 size_change_direction( 64 size_change_direction(
64 GetSizeChangeDirectionForWindowComponent(window_component)), 65 GetSizeChangeDirectionForWindowComponent(window_component)),
65 is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None), 66 is_resizable(bounds_change != WindowResizer::kBoundsChangeDirection_None),
66 source(source), 67 source(source),
67 should_attach_to_shelf( 68 should_attach_to_shelf(
68 window->GetType() == ui::wm::WINDOW_TYPE_PANEL && 69 window->GetType() == ui::wm::WINDOW_TYPE_PANEL &&
69 window->GetBoolProperty(WmWindowProperty::PANEL_ATTACHED)) { 70 window->aura_window()->GetProperty(kPanelAttachedKey)) {
70 wm::WindowState* window_state = window->GetWindowState(); 71 wm::WindowState* window_state = window->GetWindowState();
71 if ((window_state->IsNormalOrSnapped() || window_state->IsDocked()) && 72 if ((window_state->IsNormalOrSnapped() || window_state->IsDocked()) &&
72 window_state->HasRestoreBounds() && window_component == HTCAPTION) { 73 window_state->HasRestoreBounds() && window_component == HTCAPTION) {
73 restore_bounds = window_state->GetRestoreBoundsInScreen(); 74 restore_bounds = window_state->GetRestoreBoundsInScreen();
74 } 75 }
75 } 76 }
76 77
77 DragDetails::~DragDetails() {} 78 DragDetails::~DragDetails() {}
78 79
79 } // namespace ash 80 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm/dock/docked_window_resizer.cc ('k') | ash/common/wm/maximize_mode/maximize_mode_window_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698