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