OLD | NEW |
---|---|
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 "ui/aura/mus/window_tree_host_mus.h" | 5 #include "ui/aura/mus/window_tree_host_mus.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
9 #include "ui/aura/mus/input_method_mus.h" | 9 #include "ui/aura/mus/input_method_mus.h" |
10 #include "ui/aura/mus/window_port_mus.h" | 10 #include "ui/aura/mus/window_port_mus.h" |
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
193 OnHostCloseRequested(); | 193 OnHostCloseRequested(); |
194 } | 194 } |
195 | 195 |
196 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { | 196 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { |
197 // TODO: This should read the profile from mus. crbug.com/647510 | 197 // TODO: This should read the profile from mus. crbug.com/647510 |
198 return gfx::ICCProfile(); | 198 return gfx::ICCProfile(); |
199 } | 199 } |
200 | 200 |
201 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels( | 201 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels( |
202 const gfx::Point& location_in_pixels) { | 202 const gfx::Point& location_in_pixels) { |
203 // TODO: this needs to message the server http://crbug.com/693340. Setting | 203 gfx::Point screen_location_in_pixels = location_in_pixels; |
204 // the location is really only appropriate in tests, outside of tests this | 204 gfx::Point location = GetLocationOnScreenInPixels(); |
sky
2017/06/01 22:13:20
I'm confused, all the calculations here are in pix
Elliot Glaysher
2017/06/01 23:05:42
This was me not changing variable names after Ria'
| |
205 // value is ignored. | 205 screen_location_in_pixels.Offset(-location.x(), -location.y()); |
206 NOTIMPLEMENTED(); | 206 delegate_->OnWindowTreeHostMoveCursorToDisplayLocation( |
207 screen_location_in_pixels, display_id_); | |
208 | |
207 Env::GetInstance()->set_last_mouse_location(location_in_pixels); | 209 Env::GetInstance()->set_last_mouse_location(location_in_pixels); |
208 } | 210 } |
209 | 211 |
210 } // namespace aura | 212 } // namespace aura |
OLD | NEW |