Index: ash/root_window_controller.cc |
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc |
index 69777902b3b07bc370895d0dcaaa824fbc0c0683..3ce40a4ad0953c427e3fb54e546a21a0d63f54bd 100644 |
--- a/ash/root_window_controller.cc |
+++ b/ash/root_window_controller.cc |
@@ -664,8 +664,13 @@ void RootWindowController::DeactivateKeyboard( |
parent->RemoveChild(keyboard_container); |
// Virtual keyboard may be deactivated while still showing, notify all |
// observers that keyboard bounds changed to 0 before remove them. |
- keyboard_controller->NotifyKeyboardBoundsChanging(gfx::Rect()); |
+ |
+ // Shelf has already been shut down. Don't send a keyboard bounds changing |
+ // notification to it. |
stevenjb
2016/01/25 23:28:17
This is problematic. Since (presumably) shelf()->s
jdufault
2016/01/26 00:55:05
Reverted this change, the keyboard is now deinited
|
keyboard_controller->RemoveObserver(shelf()->shelf_layout_manager()); |
+ |
+ keyboard_controller->NotifyKeyboardBoundsChanging(gfx::Rect()); |
+ |
keyboard_controller->RemoveObserver(panel_layout_manager_); |
keyboard_controller->RemoveObserver(docked_layout_manager_); |
keyboard_controller->RemoveObserver( |