| 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 ash::FirstRunHelper* Shell::CreateFirstRunHelper() { | 552 ash::FirstRunHelper* Shell::CreateFirstRunHelper() { |
| 553 return new ash::FirstRunHelperImpl; | 553 return new ash::FirstRunHelperImpl; |
| 554 } | 554 } |
| 555 #endif // defined(OS_CHROMEOS) | 555 #endif // defined(OS_CHROMEOS) |
| 556 | 556 |
| 557 void Shell::DoInitialWorkspaceAnimation() { | 557 void Shell::DoInitialWorkspaceAnimation() { |
| 558 return GetPrimaryRootWindowController()->workspace_controller()-> | 558 return GetPrimaryRootWindowController()->workspace_controller()-> |
| 559 DoInitialAnimation(); | 559 DoInitialAnimation(); |
| 560 } | 560 } |
| 561 | 561 |
| 562 #if defined(OS_CHROMEOS) && defined(USE_X11) |
| 563 void Shell::SetCursorCompositingEnabled(bool enabled) { |
| 564 display_controller_->SetCursorCompositingEnabled(enabled); |
| 565 cursor_manager_.SetNativeCursorEnabled(!enabled); |
| 566 } |
| 567 #endif |
| 568 |
| 562 //////////////////////////////////////////////////////////////////////////////// | 569 //////////////////////////////////////////////////////////////////////////////// |
| 563 // Shell, private: | 570 // Shell, private: |
| 564 | 571 |
| 565 Shell::Shell(ShellDelegate* delegate) | 572 Shell::Shell(ShellDelegate* delegate) |
| 566 : target_root_window_(NULL), | 573 : target_root_window_(NULL), |
| 567 scoped_target_root_window_(NULL), | 574 scoped_target_root_window_(NULL), |
| 568 delegate_(delegate), | 575 delegate_(delegate), |
| 569 window_positioner_(new WindowPositioner), | 576 window_positioner_(new WindowPositioner), |
| 570 activation_client_(NULL), | 577 activation_client_(NULL), |
| 571 #if defined(OS_CHROMEOS) && defined(USE_X11) | 578 #if defined(OS_CHROMEOS) && defined(USE_X11) |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1053 //////////////////////////////////////////////////////////////////////////////// | 1060 //////////////////////////////////////////////////////////////////////////////// |
| 1054 // Shell, aura::client::ActivationChangeObserver implementation: | 1061 // Shell, aura::client::ActivationChangeObserver implementation: |
| 1055 | 1062 |
| 1056 void Shell::OnWindowActivated(aura::Window* gained_active, | 1063 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 1057 aura::Window* lost_active) { | 1064 aura::Window* lost_active) { |
| 1058 if (gained_active) | 1065 if (gained_active) |
| 1059 target_root_window_ = gained_active->GetRootWindow(); | 1066 target_root_window_ = gained_active->GetRootWindow(); |
| 1060 } | 1067 } |
| 1061 | 1068 |
| 1062 } // namespace ash | 1069 } // namespace ash |
| OLD | NEW |