Chromium Code Reviews| 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/accelerators/accelerator_controller.h" | 9 #include "ash/common/accelerators/accelerator_controller.h" |
| 10 #include "ash/common/key_event_watcher.h" | |
| 10 #include "ash/common/session/session_state_delegate.h" | 11 #include "ash/common/session/session_state_delegate.h" |
| 11 #include "ash/common/shell_delegate.h" | 12 #include "ash/common/shell_delegate.h" |
| 12 #include "ash/common/shell_observer.h" | 13 #include "ash/common/shell_observer.h" |
| 13 #include "ash/common/shell_window_ids.h" | 14 #include "ash/common/shell_window_ids.h" |
| 14 #include "ash/common/system/tray/system_tray_delegate.h" | 15 #include "ash/common/system/tray/system_tray_delegate.h" |
| 15 #include "ash/common/wallpaper/wallpaper_delegate.h" | 16 #include "ash/common/wallpaper/wallpaper_delegate.h" |
| 16 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" | 17 #include "ash/common/wm/maximize_mode/maximize_mode_event_handler.h" |
| 17 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" | 18 #include "ash/common/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard .h" |
| 18 #include "ash/common/wm/mru_window_tracker.h" | 19 #include "ash/common/wm/mru_window_tracker.h" |
| 19 #include "ash/common/wm/window_cycle_event_filter.h" | 20 #include "ash/common/wm/window_cycle_event_filter.h" |
| (...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 357 WmWindow* workspace_window) { | 358 WmWindow* workspace_window) { |
| 358 return base::MakeUnique<WorkspaceEventHandlerMus>( | 359 return base::MakeUnique<WorkspaceEventHandlerMus>( |
| 359 WmWindowMus::GetMusWindow(workspace_window)); | 360 WmWindowMus::GetMusWindow(workspace_window)); |
| 360 } | 361 } |
| 361 | 362 |
| 362 std::unique_ptr<ImmersiveFullscreenController> | 363 std::unique_ptr<ImmersiveFullscreenController> |
| 363 WmShellMus::CreateImmersiveFullscreenController() { | 364 WmShellMus::CreateImmersiveFullscreenController() { |
| 364 return base::MakeUnique<ImmersiveFullscreenController>(); | 365 return base::MakeUnique<ImmersiveFullscreenController>(); |
| 365 } | 366 } |
| 366 | 367 |
| 368 std::unique_ptr<KeyEventWatcher> WmShellMus::CreateKeyEventWatcher() { | |
| 369 // crbug.com/ | |
|
James Cook
2016/09/23 16:32:28
Bug number please.
oshima
2016/09/23 19:19:54
Done.
| |
| 370 NOTIMPLEMENTED(); | |
| 371 return std::unique_ptr<KeyEventWatcher>(); | |
| 372 } | |
| 373 | |
| 367 void WmShellMus::OnOverviewModeStarting() { | 374 void WmShellMus::OnOverviewModeStarting() { |
| 368 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), | 375 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), |
| 369 OnOverviewModeStarting()); | 376 OnOverviewModeStarting()); |
| 370 } | 377 } |
| 371 | 378 |
| 372 void WmShellMus::OnOverviewModeEnded() { | 379 void WmShellMus::OnOverviewModeEnded() { |
| 373 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); | 380 FOR_EACH_OBSERVER(ShellObserver, *shell_observers(), OnOverviewModeEnded()); |
| 374 } | 381 } |
| 375 | 382 |
| 376 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() { | 383 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() { |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 446 OnWindowActivated(gained_active, lost_active)); | 453 OnWindowActivated(gained_active, lost_active)); |
| 447 } | 454 } |
| 448 | 455 |
| 449 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { | 456 void WmShellMus::OnDidDestroyClient(ui::WindowTreeClient* client) { |
| 450 DCHECK_EQ(window_tree_client(), client); | 457 DCHECK_EQ(window_tree_client(), client); |
| 451 client->RemoveObserver(this); | 458 client->RemoveObserver(this); |
| 452 } | 459 } |
| 453 | 460 |
| 454 } // namespace mus | 461 } // namespace mus |
| 455 } // namespace ash | 462 } // namespace ash |
| OLD | NEW |