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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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"
9 #include "ash/wm/window_positioning_utils.h" 10 #include "ash/wm/window_positioning_utils.h"
10 #include "ash/wm/window_properties.h" 11 #include "ash/wm/window_properties.h"
11 #include "ash/wm/window_state.h" 12 #include "ash/wm/window_state.h"
12 #include "ash/wm_shell.h"
13 #include "ash/wm_window.h" 13 #include "ash/wm_window.h"
14 #include "ui/aura/window.h" 14 #include "ui/aura/window.h"
15 #include "ui/aura/window_tree_host.h" 15 #include "ui/aura/window_tree_host.h"
16 #include "ui/compositor/dip_util.h" 16 #include "ui/compositor/dip_util.h"
17 #include "ui/display/display.h" 17 #include "ui/display/display.h"
18 #include "ui/display/screen.h" 18 #include "ui/display/screen.h"
19 #include "ui/wm/core/window_util.h" 19 #include "ui/wm/core/window_util.h"
20 20
21 namespace ash { 21 namespace ash {
22 22
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 point->Offset(-display_origin.x(), -display_origin.y()); 97 point->Offset(-display_origin.x(), -display_origin.y());
98 aura::Window::ConvertPointToTarget(root, window, point); 98 aura::Window::ConvertPointToTarget(root, window, point);
99 } 99 }
100 100
101 void ScreenPositionController::ConvertHostPointToScreen( 101 void ScreenPositionController::ConvertHostPointToScreen(
102 aura::Window* root_window, 102 aura::Window* root_window,
103 gfx::Point* point) { 103 gfx::Point* point) {
104 aura::Window* root = root_window->GetRootWindow(); 104 aura::Window* root = root_window->GetRootWindow();
105 aura::Window* target_root = nullptr; 105 aura::Window* target_root = nullptr;
106 ConvertHostPointToRelativeToRootWindow( 106 ConvertHostPointToRelativeToRootWindow(
107 root, WmWindow::ToAuraWindows(WmShell::Get()->GetAllRootWindows()), point, 107 root, WmWindow::ToAuraWindows(ShellPort::Get()->GetAllRootWindows()),
108 &target_root); 108 point, &target_root);
109 ConvertPointToScreen(target_root, point); 109 ConvertPointToScreen(target_root, point);
110 } 110 }
111 111
112 void ScreenPositionController::SetBounds(aura::Window* window, 112 void ScreenPositionController::SetBounds(aura::Window* window,
113 const gfx::Rect& bounds, 113 const gfx::Rect& bounds,
114 const display::Display& display) { 114 const display::Display& display) {
115 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) { 115 if (!window->parent()->GetProperty(kUsesScreenCoordinatesKey)) {
116 window->SetBounds(bounds); 116 window->SetBounds(bounds);
117 return; 117 return;
118 } 118 }
119 119
120 wm::SetBoundsInScreen(WmWindow::Get(window), bounds, display); 120 wm::SetBoundsInScreen(WmWindow::Get(window), bounds, display);
121 } 121 }
122 122
123 } // namespace ash 123 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698