| 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/key_event_watcher.h" |
| (...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 WmShellMus::CreateImmersiveFullscreenController() { | 351 WmShellMus::CreateImmersiveFullscreenController() { |
| 352 return base::MakeUnique<ImmersiveFullscreenController>(); | 352 return base::MakeUnique<ImmersiveFullscreenController>(); |
| 353 } | 353 } |
| 354 | 354 |
| 355 std::unique_ptr<KeyEventWatcher> WmShellMus::CreateKeyEventWatcher() { | 355 std::unique_ptr<KeyEventWatcher> WmShellMus::CreateKeyEventWatcher() { |
| 356 // TODO: needs implementation for mus, http://crbug.com/649600. | 356 // TODO: needs implementation for mus, http://crbug.com/649600. |
| 357 NOTIMPLEMENTED(); | 357 NOTIMPLEMENTED(); |
| 358 return std::unique_ptr<KeyEventWatcher>(); | 358 return std::unique_ptr<KeyEventWatcher>(); |
| 359 } | 359 } |
| 360 | 360 |
| 361 void WmShellMus::OnOverviewModeStarting() { | |
| 362 for (auto& observer : *shell_observers()) | |
| 363 observer.OnOverviewModeStarting(); | |
| 364 } | |
| 365 | |
| 366 void WmShellMus::OnOverviewModeEnded() { | |
| 367 for (auto& observer : *shell_observers()) | |
| 368 observer.OnOverviewModeEnded(); | |
| 369 } | |
| 370 | |
| 371 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() { | 361 SessionStateDelegate* WmShellMus::GetSessionStateDelegate() { |
| 372 return session_state_delegate_ | 362 return session_state_delegate_ |
| 373 ? session_state_delegate_.get() | 363 ? session_state_delegate_.get() |
| 374 : Shell::GetInstance()->session_state_delegate(); | 364 : Shell::GetInstance()->session_state_delegate(); |
| 375 } | 365 } |
| 376 | 366 |
| 377 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { | 367 void WmShellMus::AddDisplayObserver(WmDisplayObserver* observer) { |
| 378 NOTIMPLEMENTED(); | 368 NOTIMPLEMENTED(); |
| 379 } | 369 } |
| 380 | 370 |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 } | 407 } |
| 418 | 408 |
| 419 void WmShellMus::CreatePrimaryHost() {} | 409 void WmShellMus::CreatePrimaryHost() {} |
| 420 | 410 |
| 421 void WmShellMus::InitHosts(const ShellInitParams& init_params) { | 411 void WmShellMus::InitHosts(const ShellInitParams& init_params) { |
| 422 window_manager_->CreatePrimaryRootWindowController( | 412 window_manager_->CreatePrimaryRootWindowController( |
| 423 base::WrapUnique(init_params.primary_window_tree_host)); | 413 base::WrapUnique(init_params.primary_window_tree_host)); |
| 424 } | 414 } |
| 425 } // namespace mus | 415 } // namespace mus |
| 426 } // namespace ash | 416 } // namespace ash |
| OLD | NEW |