| Index: chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| index 9c034830bbd6210bb132226767c4617f35e505a4..2c242238c3361af122a34588b0f2a8b9d8ecb3c2 100644
|
| --- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
|
| @@ -12,6 +12,7 @@
|
| #include "ash/common/shelf/shelf_item_delegate_manager.h"
|
| #include "ash/common/shelf/shelf_model.h"
|
| #include "ash/common/system/tray/system_tray_delegate.h"
|
| +#include "ash/common/wm_shell.h"
|
| #include "ash/desktop_background/desktop_background_controller.h"
|
| #include "ash/multi_profile_uma.h"
|
| #include "ash/root_window_controller.h"
|
| @@ -1009,7 +1010,7 @@ void ChromeLauncherController::ActiveUserChanged(
|
| // user.
|
| RestoreUnpinnedRunningApplicationOrder(user_email);
|
| // Inform the system tray of the change.
|
| - ash::Shell::GetInstance()->system_tray_delegate()->ActiveUserWasChanged();
|
| + ash::WmShell::Get()->system_tray_delegate()->ActiveUserWasChanged();
|
| // Force on-screen keyboard to reset.
|
| if (keyboard::IsKeyboardEnabled())
|
| ash::Shell::GetInstance()->CreateKeyboard();
|
|
|