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 | 9 |
10 #include "ash/accelerators/accelerator_controller.h" | 10 #include "ash/accelerators/accelerator_controller.h" |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
631 //////////////////////////////////////////////////////////////////////////////// | 631 //////////////////////////////////////////////////////////////////////////////// |
632 // Shell, private: | 632 // Shell, private: |
633 | 633 |
634 Shell::Shell(ShellDelegate* delegate) | 634 Shell::Shell(ShellDelegate* delegate) |
635 : target_root_window_(NULL), | 635 : target_root_window_(NULL), |
636 scoped_target_root_window_(NULL), | 636 scoped_target_root_window_(NULL), |
637 delegate_(delegate), | 637 delegate_(delegate), |
638 window_positioner_(new WindowPositioner), | 638 window_positioner_(new WindowPositioner), |
639 activation_client_(NULL), | 639 activation_client_(NULL), |
640 #if defined(OS_CHROMEOS) | 640 #if defined(OS_CHROMEOS) |
641 display_configurator_(new ui::DisplayConfigurator()), | 641 display_configurator_(ui::DisplayConfigurator::GetInstance()), |
642 #endif // defined(OS_CHROMEOS) | 642 #endif // defined(OS_CHROMEOS) |
643 native_cursor_manager_(new AshNativeCursorManager), | 643 native_cursor_manager_(new AshNativeCursorManager), |
644 cursor_manager_( | 644 cursor_manager_( |
645 scoped_ptr<::wm::NativeCursorManager>(native_cursor_manager_)), | 645 scoped_ptr<::wm::NativeCursorManager>(native_cursor_manager_)), |
646 simulate_modal_window_open_for_testing_(false), | 646 simulate_modal_window_open_for_testing_(false), |
647 is_touch_hud_projection_enabled_(false) { | 647 is_touch_hud_projection_enabled_(false) { |
648 DCHECK(delegate_.get()); | 648 DCHECK(delegate_.get()); |
649 gpu_support_.reset(delegate_->CreateGPUSupport()); | 649 gpu_support_.reset(delegate_->CreateGPUSupport()); |
650 display_manager_.reset(new DisplayManager); | 650 display_manager_.reset(new DisplayManager); |
651 display_controller_.reset(new DisplayController); | 651 display_controller_.reset(new DisplayController); |
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1170 //////////////////////////////////////////////////////////////////////////////// | 1170 //////////////////////////////////////////////////////////////////////////////// |
1171 // Shell, aura::client::ActivationChangeObserver implementation: | 1171 // Shell, aura::client::ActivationChangeObserver implementation: |
1172 | 1172 |
1173 void Shell::OnWindowActivated(aura::Window* gained_active, | 1173 void Shell::OnWindowActivated(aura::Window* gained_active, |
1174 aura::Window* lost_active) { | 1174 aura::Window* lost_active) { |
1175 if (gained_active) | 1175 if (gained_active) |
1176 target_root_window_ = gained_active->GetRootWindow(); | 1176 target_root_window_ = gained_active->GetRootWindow(); |
1177 } | 1177 } |
1178 | 1178 |
1179 } // namespace ash | 1179 } // namespace ash |
OLD | NEW |