| Index: ash/root_window_controller.cc
|
| diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
|
| index 386b4f2f63797a761e7e5c73a633b1f0463961de..cdd41c0f2952bf362c3f37670697977972e9d4cd 100644
|
| --- a/ash/root_window_controller.cc
|
| +++ b/ash/root_window_controller.cc
|
| @@ -481,7 +481,7 @@ void RootWindowController::CreateShelf() {
|
| }
|
|
|
| // Notify shell observers that the shelf has been created.
|
| - Shell::GetInstance()->OnShelfCreatedForRootWindow(
|
| + WmShell::Get()->NotifyShelfCreatedForRootWindow(
|
| WmWindowAura::Get(GetRootWindow()));
|
|
|
| shelf_widget_->PostCreateShelf();
|
| @@ -675,7 +675,7 @@ void RootWindowController::ActivateKeyboard(
|
| keyboard_controller->AddObserver(workspace_controller_->layout_manager());
|
| keyboard_controller->AddObserver(
|
| always_on_top_controller_->GetLayoutManager());
|
| - WmShell::Get()->OnVirtualKeyboardActivated(true);
|
| + WmShell::Get()->NotifyVirtualKeyboardActivated(true);
|
| aura::Window* parent = GetContainer(kShellWindowId_ImeWindowParentContainer);
|
| DCHECK(parent);
|
| aura::Window* keyboard_container = keyboard_controller->GetContainerWindow();
|
| @@ -705,7 +705,7 @@ void RootWindowController::DeactivateKeyboard(
|
| workspace_controller_->layout_manager());
|
| keyboard_controller->RemoveObserver(
|
| always_on_top_controller_->GetLayoutManager());
|
| - WmShell::Get()->OnVirtualKeyboardActivated(false);
|
| + WmShell::Get()->NotifyVirtualKeyboardActivated(false);
|
| }
|
| }
|
|
|
|
|