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

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

Issue 2908333003: [mus+ash] Removes WmWindow from ash (app_list, frame, metrics, session, system, wallpaper) (Closed)
Patch Set: [mus ash] Removes WmWindow from ash (rebase, nits and cleanup of use of ResizeHandleWindowTargeter) Created 3 years, 6 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/display/screen_position_controller.h" 5 #include "ash/display/screen_position_controller.h"
6 6
7 #include "ash/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_port.h"
10 #include "ash/wm/window_positioning_utils.h" 9 #include "ash/wm/window_positioning_utils.h"
11 #include "ash/wm/window_properties.h" 10 #include "ash/wm/window_properties.h"
12 #include "ash/wm/window_state.h" 11 #include "ash/wm/window_state.h"
13 #include "ash/wm_window.h"
14 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
15 #include "ui/aura/window_tree_host.h" 13 #include "ui/aura/window_tree_host.h"
16 #include "ui/compositor/dip_util.h" 14 #include "ui/compositor/dip_util.h"
17 #include "ui/display/display.h" 15 #include "ui/display/display.h"
18 #include "ui/display/screen.h" 16 #include "ui/display/screen.h"
19 #include "ui/wm/core/window_util.h" 17 #include "ui/wm/core/window_util.h"
20 18
21 namespace ash { 19 namespace ash {
22 20
23 // static 21 // static
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 .origin(); 94 .origin();
97 point->Offset(-display_origin.x(), -display_origin.y()); 95 point->Offset(-display_origin.x(), -display_origin.y());
98 aura::Window::ConvertPointToTarget(root, window, point); 96 aura::Window::ConvertPointToTarget(root, window, point);
99 } 97 }
100 98
101 void ScreenPositionController::ConvertHostPointToScreen( 99 void ScreenPositionController::ConvertHostPointToScreen(
102 aura::Window* root_window, 100 aura::Window* root_window,
103 gfx::Point* point) { 101 gfx::Point* point) {
104 aura::Window* root = root_window->GetRootWindow(); 102 aura::Window* root = root_window->GetRootWindow();
105 aura::Window* target_root = nullptr; 103 aura::Window* target_root = nullptr;
106 ConvertHostPointToRelativeToRootWindow( 104 ConvertHostPointToRelativeToRootWindow(root, Shell::GetAllRootWindows(),
107 root, WmWindow::ToAuraWindows(ShellPort::Get()->GetAllRootWindows()), 105 point, &target_root);
108 point, &target_root);
109 ConvertPointToScreen(target_root, point); 106 ConvertPointToScreen(target_root, point);
110 } 107 }
111 108
112 void ScreenPositionController::SetBounds(aura::Window* window, 109 void ScreenPositionController::SetBounds(aura::Window* window,
113 const gfx::Rect& bounds, 110 const gfx::Rect& bounds,
114 const display::Display& display) { 111 const display::Display& display) {
115 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) { 112 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) {
116 window->SetBounds(bounds); 113 window->SetBounds(bounds);
117 return; 114 return;
118 } 115 }
119 116
120 wm::SetBoundsInScreen(window, bounds, display); 117 wm::SetBoundsInScreen(window, bounds, display);
121 } 118 }
122 119
123 } // namespace ash 120 } // namespace ash
OLDNEW
« no previous file with comments | « ash/content/display/screen_orientation_controller_chromeos_unittest.cc ('k') | ash/drag_drop/drag_drop_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698