| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/shell.h" | 5 #include "ash/shell.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 672 | 672 |
| 673 wm_shell_->CreatePrimaryHost(); | 673 wm_shell_->CreatePrimaryHost(); |
| 674 wm_shell_->set_root_window_for_new_windows( | 674 wm_shell_->set_root_window_for_new_windows( |
| 675 WmWindow::Get(GetPrimaryRootWindow())); | 675 WmWindow::Get(GetPrimaryRootWindow())); |
| 676 | 676 |
| 677 if (!is_mash) { | 677 if (!is_mash) { |
| 678 resolution_notification_controller_.reset( | 678 resolution_notification_controller_.reset( |
| 679 new ResolutionNotificationController); | 679 new ResolutionNotificationController); |
| 680 } | 680 } |
| 681 | 681 |
| 682 if (cursor_manager_) | 682 if (cursor_manager_) { |
| 683 cursor_manager_->SetDisplay( | 683 cursor_manager_->SetDisplay( |
| 684 display::Screen::GetScreen()->GetPrimaryDisplay()); | 684 display::Screen::GetScreen()->GetPrimaryDisplay()); |
| 685 } |
| 685 | 686 |
| 686 if (!is_mash) { | 687 if (!is_mash) { |
| 687 // TODO(sky): move this to WmShell. http://crbug.com/671246. | 688 // TODO(sky): move this to WmShell. http://crbug.com/671246. |
| 688 accelerator_controller_delegate_.reset( | 689 accelerator_controller_delegate_.reset( |
| 689 new AcceleratorControllerDelegateAura); | 690 new AcceleratorControllerDelegateAura); |
| 690 wm_shell_->SetAcceleratorController(base::MakeUnique<AcceleratorController>( | 691 wm_shell_->SetAcceleratorController(base::MakeUnique<AcceleratorController>( |
| 691 accelerator_controller_delegate_.get(), nullptr)); | 692 accelerator_controller_delegate_.get(), nullptr)); |
| 692 } | 693 } |
| 693 wm_shell_->CreateMaximizeModeController(); | 694 wm_shell_->CreateMaximizeModeController(); |
| 694 | 695 |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { | 937 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { |
| 937 return std::unique_ptr<ui::EventTargetIterator>(); | 938 return std::unique_ptr<ui::EventTargetIterator>(); |
| 938 } | 939 } |
| 939 | 940 |
| 940 ui::EventTargeter* Shell::GetEventTargeter() { | 941 ui::EventTargeter* Shell::GetEventTargeter() { |
| 941 NOTREACHED(); | 942 NOTREACHED(); |
| 942 return nullptr; | 943 return nullptr; |
| 943 } | 944 } |
| 944 | 945 |
| 945 } // namespace ash | 946 } // namespace ash |
| OLD | NEW |