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 1137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1148 void Shell::OnEvent(ui::Event* event) { | 1148 void Shell::OnEvent(ui::Event* event) { |
1149 } | 1149 } |
1150 | 1150 |
1151 //////////////////////////////////////////////////////////////////////////////// | 1151 //////////////////////////////////////////////////////////////////////////////// |
1152 // Shell, aura::client::ActivationChangeObserver implementation: | 1152 // Shell, aura::client::ActivationChangeObserver implementation: |
1153 | 1153 |
1154 void Shell::OnWindowActivated(aura::Window* gained_active, | 1154 void Shell::OnWindowActivated(aura::Window* gained_active, |
1155 aura::Window* lost_active) { | 1155 aura::Window* lost_active) { |
1156 if (gained_active) | 1156 if (gained_active) |
1157 target_root_window_ = gained_active->GetRootWindow(); | 1157 target_root_window_ = gained_active->GetRootWindow(); |
1158 input_method_filter_->UpdateTargetDispatcher( | |
1159 target_root_window_ ? target_root_window_->GetHost()->event_processor() | |
1160 : NULL); | |
sadrul
2014/05/31 18:10:16
The problem with this is that all non-ash users of
Shu Chen
2014/06/01 05:33:23
Done.
| |
1158 } | 1161 } |
1159 | 1162 |
1160 } // namespace ash | 1163 } // namespace ash |
OLD | NEW |