| 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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 186 GetInputMethod()->OnFocus(); | 186 GetInputMethod()->OnFocus(); |
| 187 else | 187 else |
| 188 GetInputMethod()->OnBlur(); | 188 GetInputMethod()->OnBlur(); |
| 189 WindowTreeHostPlatform::OnActivationChanged(active); | 189 WindowTreeHostPlatform::OnActivationChanged(active); |
| 190 } | 190 } |
| 191 | 191 |
| 192 void WindowTreeHostMus::OnCloseRequest() { | 192 void WindowTreeHostMus::OnCloseRequest() { |
| 193 OnHostCloseRequested(); | 193 OnHostCloseRequested(); |
| 194 } | 194 } |
| 195 | 195 |
| 196 gfx::ICCProfile WindowTreeHostMus::GetICCProfileForCurrentDisplay() { | |
| 197 // TODO: This should read the profile from mus. crbug.com/647510 | |
| 198 return gfx::ICCProfile(); | |
| 199 } | |
| 200 | |
| 201 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels( | 196 void WindowTreeHostMus::MoveCursorToScreenLocationInPixels( |
| 202 const gfx::Point& location_in_pixels) { | 197 const gfx::Point& location_in_pixels) { |
| 203 gfx::Point screen_location_in_pixels = location_in_pixels; | 198 gfx::Point screen_location_in_pixels = location_in_pixels; |
| 204 gfx::Point location = GetLocationOnScreenInPixels(); | 199 gfx::Point location = GetLocationOnScreenInPixels(); |
| 205 screen_location_in_pixels.Offset(-location.x(), -location.y()); | 200 screen_location_in_pixels.Offset(-location.x(), -location.y()); |
| 206 delegate_->OnWindowTreeHostMoveCursorToDisplayLocation( | 201 delegate_->OnWindowTreeHostMoveCursorToDisplayLocation( |
| 207 screen_location_in_pixels, display_id_); | 202 screen_location_in_pixels, display_id_); |
| 208 | 203 |
| 209 Env::GetInstance()->set_last_mouse_location(location_in_pixels); | 204 Env::GetInstance()->set_last_mouse_location(location_in_pixels); |
| 210 } | 205 } |
| 211 | 206 |
| 212 } // namespace aura | 207 } // namespace aura |
| OLD | NEW |