| 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/shell_port_mash.h" | 5 #include "ash/mus/bridge/shell_port_mash.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/accelerators/accelerator_controller.h" | 9 #include "ash/accelerators/accelerator_controller.h" |
| 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" | 10 #include "ash/accelerators/accelerator_controller_delegate_aura.h" |
| (...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 482 if (mirrored_display.is_valid()) { | 482 if (mirrored_display.is_valid()) { |
| 483 display_params->display = | 483 display_params->display = |
| 484 base::MakeUnique<display::Display>(mirrored_display); | 484 base::MakeUnique<display::Display>(mirrored_display); |
| 485 } | 485 } |
| 486 // TODO: wire update is_primary_display correctly. | 486 // TODO: wire update is_primary_display correctly. |
| 487 display_params->is_primary_display = true; | 487 display_params->is_primary_display = true; |
| 488 aura::WindowTreeHostMusInitParams aura_init_params = | 488 aura::WindowTreeHostMusInitParams aura_init_params = |
| 489 window_manager_->window_manager_client()->CreateInitParamsForNewDisplay(); | 489 window_manager_->window_manager_client()->CreateInitParamsForNewDisplay(); |
| 490 aura_init_params.display_id = init_params.display_id; | 490 aura_init_params.display_id = init_params.display_id; |
| 491 aura_init_params.display_init_params = std::move(display_params); | 491 aura_init_params.display_init_params = std::move(display_params); |
| 492 aura_init_params.use_classic_ime = true; |
| 492 return base::MakeUnique<AshWindowTreeHostMus>(std::move(aura_init_params)); | 493 return base::MakeUnique<AshWindowTreeHostMus>(std::move(aura_init_params)); |
| 493 } | 494 } |
| 494 | 495 |
| 495 void ShellPortMash::OnCreatedRootWindowContainers( | 496 void ShellPortMash::OnCreatedRootWindowContainers( |
| 496 RootWindowController* root_window_controller) { | 497 RootWindowController* root_window_controller) { |
| 497 // TODO: To avoid lots of IPC AddActivationParent() should take an array. | 498 // TODO: To avoid lots of IPC AddActivationParent() should take an array. |
| 498 // http://crbug.com/682048. | 499 // http://crbug.com/682048. |
| 499 aura::Window* root_window = root_window_controller->GetRootWindow(); | 500 aura::Window* root_window = root_window_controller->GetRootWindow(); |
| 500 for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) { | 501 for (size_t i = 0; i < kNumActivatableShellWindowIds; ++i) { |
| 501 window_manager_->window_manager_client()->AddActivationParent( | 502 window_manager_->window_manager_client()->AddActivationParent( |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 mash_state_->accelerator_controller_registrar = | 564 mash_state_->accelerator_controller_registrar = |
| 564 base ::MakeUnique<AcceleratorControllerRegistrar>( | 565 base ::MakeUnique<AcceleratorControllerRegistrar>( |
| 565 window_manager_, accelerator_namespace_id); | 566 window_manager_, accelerator_namespace_id); |
| 566 return base::MakeUnique<AcceleratorController>( | 567 return base::MakeUnique<AcceleratorController>( |
| 567 mash_state_->accelerator_controller_delegate.get(), | 568 mash_state_->accelerator_controller_delegate.get(), |
| 568 mash_state_->accelerator_controller_registrar.get()); | 569 mash_state_->accelerator_controller_registrar.get()); |
| 569 } | 570 } |
| 570 | 571 |
| 571 } // namespace mus | 572 } // namespace mus |
| 572 } // namespace ash | 573 } // namespace ash |
| OLD | NEW |