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

Side by Side Diff: ash/wm/workspace/workspace_window_resizer.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: 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 (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/workspace/workspace_window_resizer.h" 5 #include "ash/wm/workspace/workspace_window_resizer.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
11 11
12 #include "ash/ash_switches.h" 12 #include "ash/common/ash_switches.h"
13 #include "ash/common/wm_shell.h"
14 #include "ash/common/wm_window.h"
13 #include "ash/metrics/user_metrics_action.h" 15 #include "ash/metrics/user_metrics_action.h"
14 #include "ash/public/cpp/shell_window_ids.h" 16 #include "ash/public/cpp/shell_window_ids.h"
15 #include "ash/root_window_controller.h" 17 #include "ash/root_window_controller.h"
16 #include "ash/shell.h" 18 #include "ash/shell.h"
17 #include "ash/wm/default_window_resizer.h" 19 #include "ash/wm/default_window_resizer.h"
18 #include "ash/wm/dock/docked_window_layout_manager.h" 20 #include "ash/wm/dock/docked_window_layout_manager.h"
19 #include "ash/wm/dock/docked_window_resizer.h" 21 #include "ash/wm/dock/docked_window_resizer.h"
20 #include "ash/wm/panels/panel_window_resizer.h" 22 #include "ash/wm/panels/panel_window_resizer.h"
21 #include "ash/wm/window_positioning_utils.h" 23 #include "ash/wm/window_positioning_utils.h"
22 #include "ash/wm/window_state.h" 24 #include "ash/wm/window_state.h"
23 #include "ash/wm/wm_event.h" 25 #include "ash/wm/wm_event.h"
24 #include "ash/wm/wm_screen_util.h" 26 #include "ash/wm/wm_screen_util.h"
25 #include "ash/wm/workspace/phantom_window_controller.h" 27 #include "ash/wm/workspace/phantom_window_controller.h"
26 #include "ash/wm/workspace/two_step_edge_cycler.h" 28 #include "ash/wm/workspace/two_step_edge_cycler.h"
27 #include "ash/wm_shell.h"
28 #include "ash/wm_window.h"
29 #include "base/memory/ptr_util.h" 29 #include "base/memory/ptr_util.h"
30 #include "base/memory/weak_ptr.h" 30 #include "base/memory/weak_ptr.h"
31 #include "ui/base/hit_test.h" 31 #include "ui/base/hit_test.h"
32 #include "ui/compositor/layer.h" 32 #include "ui/compositor/layer.h"
33 #include "ui/display/display.h" 33 #include "ui/display/display.h"
34 #include "ui/display/screen.h" 34 #include "ui/display/screen.h"
35 #include "ui/gfx/transform.h" 35 #include "ui/gfx/transform.h"
36 #include "ui/wm/public/window_types.h" 36 #include "ui/wm/public/window_types.h"
37 37
38 namespace ash { 38 namespace ash {
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
1012 DCHECK(snapped_type == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED || 1012 DCHECK(snapped_type == wm::WINDOW_STATE_TYPE_LEFT_SNAPPED ||
1013 snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED); 1013 snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED);
1014 gfx::Rect snapped_bounds = wm::GetDisplayWorkAreaBoundsInParent(GetTarget()); 1014 gfx::Rect snapped_bounds = wm::GetDisplayWorkAreaBoundsInParent(GetTarget());
1015 if (snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED) 1015 if (snapped_type == wm::WINDOW_STATE_TYPE_RIGHT_SNAPPED)
1016 snapped_bounds.set_x(snapped_bounds.right() - bounds_in_parent.width()); 1016 snapped_bounds.set_x(snapped_bounds.right() - bounds_in_parent.width());
1017 snapped_bounds.set_width(bounds_in_parent.width()); 1017 snapped_bounds.set_width(bounds_in_parent.width());
1018 return bounds_in_parent == snapped_bounds; 1018 return bounds_in_parent == snapped_bounds;
1019 } 1019 }
1020 1020
1021 } // namespace ash 1021 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/workspace/workspace_layout_manager_unittest.cc ('k') | ash/wm/workspace/workspace_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698