| Index: ash/mus/bridge/wm_shell_mus.cc
|
| diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
|
| index 035fde264e596553f2aee017228c350134b4df7f..2eb8244f4595cf75df212f0633d2ed8c07892e00 100644
|
| --- a/ash/mus/bridge/wm_shell_mus.cc
|
| +++ b/ash/mus/bridge/wm_shell_mus.cc
|
| @@ -274,6 +274,21 @@ void WmShellMus::RemoveShellObserver(ShellObserver* observer) {
|
| wm_shell_common_->RemoveShellObserver(observer);
|
| }
|
|
|
| +void WmShellMus::AddPointerWatcher(views::PointerWatcher* watcher) {
|
| + // TODO(jamescook): Move PointerWatcherDelegateMus to //ash/mus and use here.
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +void WmShellMus::RemovePointerWatcher(views::PointerWatcher* watcher) {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +#if defined(OS_CHROMEOS)
|
| +void WmShellMus::ToggleIgnoreExternalKeyboard() {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +#endif // defined(OS_CHROMEOS)
|
| +
|
| // static
|
| bool WmShellMus::IsActivationParent(::mus::Window* window) {
|
| return window && IsActivatableShellWindowId(
|
| @@ -305,11 +320,5 @@ void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
|
| RemoveClientObserver();
|
| }
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -void WmShellMus::ToggleIgnoreExternalKeyboard() {
|
| - NOTIMPLEMENTED();
|
| -}
|
| -#endif // defined(OS_CHROMEOS)
|
| -
|
| } // namespace mus
|
| } // namespace ash
|
|
|