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 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 RootWindowControllerList controllers = GetAllRootWindowControllers(); | 1119 RootWindowControllerList controllers = GetAllRootWindowControllers(); |
1120 for (RootWindowControllerList::iterator iter = controllers.begin(); | 1120 for (RootWindowControllerList::iterator iter = controllers.begin(); |
1121 iter != controllers.end(); ++iter) { | 1121 iter != controllers.end(); ++iter) { |
1122 (*iter)->DeactivateKeyboard( | 1122 (*iter)->DeactivateKeyboard( |
1123 keyboard::KeyboardController::GetInstance()); | 1123 keyboard::KeyboardController::GetInstance()); |
1124 } | 1124 } |
1125 } | 1125 } |
1126 keyboard::KeyboardController::ResetInstance( | 1126 keyboard::KeyboardController::ResetInstance( |
1127 new keyboard::KeyboardController(shell_delegate_->CreateKeyboardUI(), | 1127 new keyboard::KeyboardController(shell_delegate_->CreateKeyboardUI(), |
1128 virtual_keyboard_controller_.get())); | 1128 virtual_keyboard_controller_.get())); |
| 1129 for (auto& observer : shell_observers_) |
| 1130 observer.OnKeyboardControllerCreated(); |
1129 } | 1131 } |
1130 } | 1132 } |
1131 | 1133 |
1132 void Shell::InitRootWindow(aura::Window* root_window) { | 1134 void Shell::InitRootWindow(aura::Window* root_window) { |
1133 DCHECK(focus_controller_); | 1135 DCHECK(focus_controller_); |
1134 DCHECK(visibility_controller_.get()); | 1136 DCHECK(visibility_controller_.get()); |
1135 DCHECK(drag_drop_controller_.get()); | 1137 DCHECK(drag_drop_controller_.get()); |
1136 | 1138 |
1137 aura::client::SetFocusClient(root_window, focus_controller_.get()); | 1139 aura::client::SetFocusClient(root_window, focus_controller_.get()); |
1138 aura::client::SetActivationClient(root_window, focus_controller_.get()); | 1140 aura::client::SetActivationClient(root_window, focus_controller_.get()); |
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1268 void Shell::OnPrefServiceInitialized( | 1270 void Shell::OnPrefServiceInitialized( |
1269 std::unique_ptr<::PrefService> pref_service) { | 1271 std::unique_ptr<::PrefService> pref_service) { |
1270 if (!instance_) | 1272 if (!instance_) |
1271 return; | 1273 return; |
1272 // |pref_service_| is null if can't connect to Chrome (as happens when | 1274 // |pref_service_| is null if can't connect to Chrome (as happens when |
1273 // running mash outside of chrome --mash and chrome isn't built). | 1275 // running mash outside of chrome --mash and chrome isn't built). |
1274 pref_service_ = std::move(pref_service); | 1276 pref_service_ = std::move(pref_service); |
1275 } | 1277 } |
1276 | 1278 |
1277 } // namespace ash | 1279 } // namespace ash |
OLD | NEW |