| Index: chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
|
| index bd6bb910dff2113ad9aef87deab15cd35c726e24..30e3df69debdd45453ef55d81e35176d748e3208 100644
|
| --- a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
|
| +++ b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "ash/common/shelf/shelf_item_types.h"
|
| #include "ash/common/wm_window.h"
|
| -#include "ash/common/wm_window_property.h"
|
| +#include "ash/public/cpp/window_properties.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
|
| @@ -17,6 +17,7 @@
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/settings_window_manager.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| +#include "ui/aura/window.h"
|
|
|
| MultiProfileBrowserStatusMonitor::MultiProfileBrowserStatusMonitor(
|
| ChromeLauncherController* launcher_controller)
|
| @@ -77,12 +78,12 @@ void MultiProfileBrowserStatusMonitor::ActiveUserChanged(
|
| if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(
|
| browser)) {
|
| aura::Window* aura_window = browser->window()->GetNativeWindow();
|
| - ash::WmWindow::Get(aura_window)
|
| - ->SetIntProperty(
|
| - ash::WmWindowProperty::SHELF_ITEM_TYPE,
|
| + aura_window->SetProperty(
|
| + ash::kShelfItemTypeKey,
|
| + static_cast<int32_t>(
|
| multi_user_util::IsProfileFromActiveUser(browser->profile())
|
| ? ash::TYPE_DIALOG
|
| - : ash::TYPE_UNDEFINED);
|
| + : ash::TYPE_UNDEFINED));
|
| }
|
| }
|
|
|
|
|