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/common/wm_shell.h" | 5 #include "ash/common/wm_shell.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/accelerators/ash_focus_manager_factory.h" | 10 #include "ash/common/accelerators/ash_focus_manager_factory.h" |
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 delegate_->GetAppListPresenter()->Dismiss(); | 335 delegate_->GetAppListPresenter()->Dismiss(); |
336 } | 336 } |
337 | 337 |
338 void WmShell::ToggleAppList() { | 338 void WmShell::ToggleAppList() { |
339 // Show the app list on the default display for new windows. | 339 // Show the app list on the default display for new windows. |
340 int64_t display_id = | 340 int64_t display_id = |
341 GetRootWindowForNewWindows()->GetDisplayNearestWindow().id(); | 341 GetRootWindowForNewWindows()->GetDisplayNearestWindow().id(); |
342 delegate_->GetAppListPresenter()->ToggleAppList(display_id); | 342 delegate_->GetAppListPresenter()->ToggleAppList(display_id); |
343 } | 343 } |
344 | 344 |
345 bool WmShell::IsApplistVisible() const { | 345 bool WmShell::IsApplistVisible(int64_t display_id) const { |
346 return delegate_->GetAppListPresenter()->IsVisible(); | 346 return delegate_->GetAppListPresenter()->IsVisible(display_id); |
347 } | 347 } |
348 | 348 |
349 bool WmShell::GetAppListTargetVisibility() const { | 349 bool WmShell::GetAppListTargetVisibility(int64_t display_id) const { |
350 return delegate_->GetAppListPresenter()->GetTargetVisibility(); | 350 return delegate_->GetAppListPresenter()->GetTargetVisibility(display_id); |
351 } | 351 } |
352 | 352 |
353 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) { | 353 void WmShell::SetKeyboardUI(std::unique_ptr<KeyboardUI> keyboard_ui) { |
354 keyboard_ui_ = std::move(keyboard_ui); | 354 keyboard_ui_ = std::move(keyboard_ui); |
355 } | 355 } |
356 | 356 |
357 void WmShell::SetSystemTrayDelegate( | 357 void WmShell::SetSystemTrayDelegate( |
358 std::unique_ptr<SystemTrayDelegate> delegate) { | 358 std::unique_ptr<SystemTrayDelegate> delegate) { |
359 DCHECK(delegate); | 359 DCHECK(delegate); |
360 system_tray_delegate_ = std::move(delegate); | 360 system_tray_delegate_ = std::move(delegate); |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 void WmShell::DeleteToastManager() { | 403 void WmShell::DeleteToastManager() { |
404 toast_manager_.reset(); | 404 toast_manager_.reset(); |
405 } | 405 } |
406 | 406 |
407 void WmShell::SetAcceleratorController( | 407 void WmShell::SetAcceleratorController( |
408 std::unique_ptr<AcceleratorController> accelerator_controller) { | 408 std::unique_ptr<AcceleratorController> accelerator_controller) { |
409 accelerator_controller_ = std::move(accelerator_controller); | 409 accelerator_controller_ = std::move(accelerator_controller); |
410 } | 410 } |
411 | 411 |
412 } // namespace ash | 412 } // namespace ash |
OLD | NEW |