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

Side by Side Diff: ash/display/extended_mouse_warp_controller.cc

Issue 2286523002: Relocate reuseable portions of ash/display/display_util.* (Closed)
Patch Set: fixed ozone build Created 4 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 unified diff | Download patch
« no previous file with comments | « ash/display/display_util_unittest.cc ('k') | ash/display/unified_mouse_warp_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/display/extended_mouse_warp_controller.h" 5 #include "ash/display/extended_mouse_warp_controller.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #include "ash/display/display_manager.h" 9 #include "ash/display/display_manager.h"
10 #include "ash/display/display_util.h" 10 #include "ash/display/display_util.h"
11 #include "ash/display/shared_display_edge_indicator.h" 11 #include "ash/display/shared_display_edge_indicator.h"
12 #include "ash/display/window_tree_host_manager.h" 12 #include "ash/display/window_tree_host_manager.h"
13 #include "ash/root_window_controller.h" 13 #include "ash/root_window_controller.h"
14 #include "ash/screen_util.h" 14 #include "ash/screen_util.h"
15 #include "ash/shell.h" 15 #include "ash/shell.h"
16 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
17 #include "ui/aura/window.h" 17 #include "ui/aura/window.h"
18 #include "ui/display/manager/display_layout.h" 18 #include "ui/display/manager/display_layout.h"
19 #include "ui/display/manager/display_manager_utilities.h"
19 #include "ui/display/screen.h" 20 #include "ui/display/screen.h"
20 #include "ui/events/event_utils.h" 21 #include "ui/events/event_utils.h"
21 #include "ui/wm/core/coordinate_conversion.h" 22 #include "ui/wm/core/coordinate_conversion.h"
22 23
23 namespace ash { 24 namespace ash {
24 25
25 namespace { 26 namespace {
26 27
27 // Maximum size on the display edge that initiate snapping phantom window, 28 // Maximum size on the display edge that initiate snapping phantom window,
28 // from the corner of the display. 29 // from the corner of the display.
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 std::unique_ptr<ExtendedMouseWarpController::WarpRegion> 203 std::unique_ptr<ExtendedMouseWarpController::WarpRegion>
203 ExtendedMouseWarpController::CreateWarpRegion(const display::Display& a, 204 ExtendedMouseWarpController::CreateWarpRegion(const display::Display& a,
204 const display::Display& b, 205 const display::Display& b,
205 int64_t drag_source_id) { 206 int64_t drag_source_id) {
206 gfx::Rect a_edge; 207 gfx::Rect a_edge;
207 gfx::Rect b_edge; 208 gfx::Rect b_edge;
208 int snap_barrier = drag_source_id == display::Display::kInvalidDisplayID 209 int snap_barrier = drag_source_id == display::Display::kInvalidDisplayID
209 ? 0 210 ? 0
210 : kMaximumSnapHeight; 211 : kMaximumSnapHeight;
211 212
212 if (!ComputeBoundary(a, b, &a_edge, &b_edge)) 213 if (!display::ComputeBoundary(a, b, &a_edge, &b_edge))
213 return nullptr; 214 return nullptr;
214 215
215 // Creates the snap window barrirer only when horizontally connected. 216 // Creates the snap window barrirer only when horizontally connected.
216 if (a_edge.height() > a_edge.width()) { 217 if (a_edge.height() > a_edge.width()) {
217 if (drag_source_id == a.id()) 218 if (drag_source_id == a.id())
218 AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge); 219 AdjustSourceEdgeBounds(a.bounds(), snap_barrier, &a_edge);
219 else if (drag_source_id == b.id()) 220 else if (drag_source_id == b.id())
220 AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge); 221 AdjustSourceEdgeBounds(b.bounds(), snap_barrier, &b_edge);
221 } 222 }
222 223
223 return base::MakeUnique<WarpRegion>(a.id(), b.id(), a_edge, b_edge); 224 return base::MakeUnique<WarpRegion>(a.id(), b.id(), a_edge, b_edge);
224 } 225 }
225 226
226 } // namespace ash 227 } // namespace ash
OLDNEW
« no previous file with comments | « ash/display/display_util_unittest.cc ('k') | ash/display/unified_mouse_warp_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698