| 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 "components/exo/wm_helper_mus.h" | 5 #include "components/exo/wm_helper_mus.h" |
| 6 | 6 |
| 7 #include "ui/aura/client/focus_client.h" | 7 #include "ui/aura/client/focus_client.h" |
| 8 #include "ui/aura/env.h" | 8 #include "ui/aura/env.h" |
| 9 #include "ui/aura/mus/focus_synchronizer.h" | 9 #include "ui/aura/mus/focus_synchronizer.h" |
| 10 #include "ui/aura/mus/window_tree_client.h" | 10 #include "ui/aura/mus/window_tree_client.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 | 36 |
| 37 //////////////////////////////////////////////////////////////////////////////// | 37 //////////////////////////////////////////////////////////////////////////////// |
| 38 // WMHelperMus, private: | 38 // WMHelperMus, private: |
| 39 | 39 |
| 40 const display::ManagedDisplayInfo WMHelperMus::GetDisplayInfo( | 40 const display::ManagedDisplayInfo WMHelperMus::GetDisplayInfo( |
| 41 int64_t display_id) const { | 41 int64_t display_id) const { |
| 42 // TODO(penghuang): Return real display info when it is supported in mus. | 42 // TODO(penghuang): Return real display info when it is supported in mus. |
| 43 return display::ManagedDisplayInfo(display_id, "", false); | 43 return display::ManagedDisplayInfo(display_id, "", false); |
| 44 } | 44 } |
| 45 | 45 |
| 46 aura::Window* WMHelperMus::GetContainer(int container_id) { | 46 aura::Window* WMHelperMus::GetContainer(int64_t display_id, int container_id) { |
| 47 NOTIMPLEMENTED(); | 47 NOTIMPLEMENTED(); |
| 48 return nullptr; | 48 return nullptr; |
| 49 } | 49 } |
| 50 | 50 |
| 51 aura::Window* WMHelperMus::GetActiveWindow() const { | 51 aura::Window* WMHelperMus::GetActiveWindow() const { |
| 52 return active_window_; | 52 return active_window_; |
| 53 } | 53 } |
| 54 | 54 |
| 55 aura::Window* WMHelperMus::GetFocusedWindow() const { | 55 aura::Window* WMHelperMus::GetFocusedWindow() const { |
| 56 return focused_window_; | 56 return focused_window_; |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 NotifyWindowFocused(focused_window_, lost_focus); | 148 NotifyWindowFocused(focused_window_, lost_focus); |
| 149 } | 149 } |
| 150 | 150 |
| 151 aura::client::ActivationClient* WMHelperMus::GetActivationClient() { | 151 aura::client::ActivationClient* WMHelperMus::GetActivationClient() { |
| 152 return root_with_active_focus_client_ | 152 return root_with_active_focus_client_ |
| 153 ? aura::client::GetActivationClient(root_with_active_focus_client_) | 153 ? aura::client::GetActivationClient(root_with_active_focus_client_) |
| 154 : nullptr; | 154 : nullptr; |
| 155 } | 155 } |
| 156 | 156 |
| 157 } // namespace exo | 157 } // namespace exo |
| OLD | NEW |