| 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 1124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1135 | 1135 |
| 1136 //////////////////////////////////////////////////////////////////////////////// | 1136 //////////////////////////////////////////////////////////////////////////////// |
| 1137 // Shell, aura::client::ActivationChangeObserver implementation: | 1137 // Shell, aura::client::ActivationChangeObserver implementation: |
| 1138 | 1138 |
| 1139 void Shell::OnWindowActivated(aura::Window* gained_active, | 1139 void Shell::OnWindowActivated(aura::Window* gained_active, |
| 1140 aura::Window* lost_active) { | 1140 aura::Window* lost_active) { |
| 1141 if (gained_active) | 1141 if (gained_active) |
| 1142 target_root_window_ = gained_active->GetRootWindow(); | 1142 target_root_window_ = gained_active->GetRootWindow(); |
| 1143 } | 1143 } |
| 1144 | 1144 |
| 1145 void Shell::SetSessionStateDelegateForTesting( |
| 1146 SessionStateDelegate* session_state_delegate) { |
| 1147 session_state_delegate_.reset(session_state_delegate); |
| 1148 } |
| 1149 |
| 1145 } // namespace ash | 1150 } // namespace ash |
| OLD | NEW |