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 "ash/mus/bridge/wm_shell_mus.h" | 5 #include "ash/mus/bridge/wm_shell_mus.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/display/display_info.h" | 9 #include "ash/common/display/display_info.h" |
10 #include "ash/common/keyboard/keyboard_ui.h" | 10 #include "ash/common/keyboard/keyboard_ui.h" |
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
299 } | 299 } |
300 | 300 |
301 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { | 301 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { |
302 NOTIMPLEMENTED(); | 302 NOTIMPLEMENTED(); |
303 } | 303 } |
304 | 304 |
305 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { | 305 void WmShellMus::RemoveDisplayObserver(WmDisplayObserver* observer) { |
306 NOTIMPLEMENTED(); | 306 NOTIMPLEMENTED(); |
307 } | 307 } |
308 | 308 |
309 void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) { | 309 void WmShellMus::AddPointerDownWatcher(views::PointerDownWatcher* watcher) { |
310 // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here. | 310 // TODO(jamescook): Move PointerDownWatcherDelegateMus to //ash/mus |
| 311 // and use here. |
311 NOTIMPLEMENTED(); | 312 NOTIMPLEMENTED(); |
312 } | 313 } |
313 | 314 |
314 void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) { | 315 void WmShellMus::RemovePointerDownWatcher(views::PointerDownWatcher* watcher) { |
315 NOTIMPLEMENTED(); | 316 NOTIMPLEMENTED(); |
316 } | 317 } |
317 | 318 |
318 #if defined(OS_CHROMEOS) | 319 #if defined(OS_CHROMEOS) |
319 void WmShellMus::ToggleIgnoreExternalKeyboard() { | 320 void WmShellMus::ToggleIgnoreExternalKeyboard() { |
320 NOTIMPLEMENTED(); | 321 NOTIMPLEMENTED(); |
321 } | 322 } |
322 #endif // defined(OS_CHROMEOS) | 323 #endif // defined(OS_CHROMEOS) |
323 | 324 |
324 // static | 325 // static |
(...skipping 22 matching lines...) Expand all Loading... |
347 OnWindowActivated(gained_active, lost_active)); | 348 OnWindowActivated(gained_active, lost_active)); |
348 } | 349 } |
349 | 350 |
350 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) { | 351 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) { |
351 DCHECK_EQ(client, client_); | 352 DCHECK_EQ(client, client_); |
352 RemoveClientObserver(); | 353 RemoveClientObserver(); |
353 } | 354 } |
354 | 355 |
355 } // namespace mus | 356 } // namespace mus |
356 } // namespace ash | 357 } // namespace ash |
OLD | NEW |