| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "mash/simple_wm/simple_wm.h" | 5 #include "mash/simple_wm/simple_wm.h" |
| 6 | 6 |
| 7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
| 8 #include "ui/aura/client/aura_constants.h" | 8 #include "ui/aura/client/aura_constants.h" |
| 9 #include "ui/display/screen_base.h" | 9 #include "ui/display/screen_base.h" |
| 10 #include "ui/gfx/canvas.h" | 10 #include "ui/gfx/canvas.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 // WindowTreeClients configured as the window manager should never get | 107 // WindowTreeClients configured as the window manager should never get |
| 108 // OnEmbed(). | 108 // OnEmbed(). |
| 109 NOTREACHED(); | 109 NOTREACHED(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 void SimpleWM::OnLostConnection(aura::WindowTreeClient* client) { | 112 void SimpleWM::OnLostConnection(aura::WindowTreeClient* client) { |
| 113 window_tree_host_.reset(); | 113 window_tree_host_.reset(); |
| 114 window_tree_client_.reset(); | 114 window_tree_client_.reset(); |
| 115 } | 115 } |
| 116 | 116 |
| 117 void SimpleWM::OnEmbedRootDestroyed(aura::Window* root) { | 117 void SimpleWM::OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) { |
| 118 // WindowTreeClients configured as the window manager should never get | 118 // WindowTreeClients configured as the window manager should never get |
| 119 // OnEmbedRootDestroyed(). | 119 // OnEmbedRootDestroyed(). |
| 120 NOTREACHED(); | 120 NOTREACHED(); |
| 121 } | 121 } |
| 122 | 122 |
| 123 void SimpleWM::OnPointerEventObserved(const ui::PointerEvent& event, | 123 void SimpleWM::OnPointerEventObserved(const ui::PointerEvent& event, |
| 124 aura::Window* target) { | 124 aura::Window* target) { |
| 125 // Don't care. | 125 // Don't care. |
| 126 } | 126 } |
| 127 | 127 |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 236 const std::vector<gfx::Rect>& additional_client_areas) {} | 236 const std::vector<gfx::Rect>& additional_client_areas) {} |
| 237 | 237 |
| 238 SimpleWM::FrameView* SimpleWM::GetFrameViewForClientWindow( | 238 SimpleWM::FrameView* SimpleWM::GetFrameViewForClientWindow( |
| 239 aura::Window* client_window) { | 239 aura::Window* client_window) { |
| 240 auto it = client_window_to_frame_view_.find(client_window); | 240 auto it = client_window_to_frame_view_.find(client_window); |
| 241 return it != client_window_to_frame_view_.end() ? it->second : nullptr; | 241 return it != client_window_to_frame_view_.end() ? it->second : nullptr; |
| 242 } | 242 } |
| 243 | 243 |
| 244 } // namespace simple_wm | 244 } // namespace simple_wm |
| 245 | 245 |
| OLD | NEW |