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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 } | 51 } |
52 | 52 |
53 aura::Window* WMHelperMus::GetActiveWindow() const { | 53 aura::Window* WMHelperMus::GetActiveWindow() const { |
54 return active_window_; | 54 return active_window_; |
55 } | 55 } |
56 | 56 |
57 aura::Window* WMHelperMus::GetFocusedWindow() const { | 57 aura::Window* WMHelperMus::GetFocusedWindow() const { |
58 return focused_window_; | 58 return focused_window_; |
59 } | 59 } |
60 | 60 |
61 ui::CursorSetType WMHelperMus::GetCursorSet() const { | 61 ui::CursorSize WMHelperMus::GetCursorSize() const { |
62 NOTIMPLEMENTED(); | 62 NOTIMPLEMENTED(); |
63 return ui::CursorSetType::CURSOR_SET_NORMAL; | 63 return ui::CursorSize::kNormal; |
64 } | 64 } |
65 | 65 |
66 const display::Display& WMHelperMus::GetCursorDisplay() const { | 66 const display::Display& WMHelperMus::GetCursorDisplay() const { |
67 NOTIMPLEMENTED(); | 67 NOTIMPLEMENTED(); |
68 // TODO(penghuang): Return real display when supported in mus. | 68 // TODO(penghuang): Return real display when supported in mus. |
69 static const display::Display display; | 69 static const display::Display display; |
70 return display; | 70 return display; |
71 } | 71 } |
72 | 72 |
73 void WMHelperMus::AddPreTargetHandler(ui::EventHandler* handler) { | 73 void WMHelperMus::AddPreTargetHandler(ui::EventHandler* handler) { |
(...skipping 74 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 wm::ActivationClient* WMHelperMus::GetActivationClient() { | 151 wm::ActivationClient* WMHelperMus::GetActivationClient() { |
152 return root_with_active_focus_client_ | 152 return root_with_active_focus_client_ |
153 ? wm::GetActivationClient(root_with_active_focus_client_) | 153 ? wm::GetActivationClient(root_with_active_focus_client_) |
154 : nullptr; | 154 : nullptr; |
155 } | 155 } |
156 | 156 |
157 } // namespace exo | 157 } // namespace exo |
OLD | NEW |