Chromium Code Reviews| 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..c878180a2763a6bfbc2abd67552bcacc66ad2e19 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,11 @@ 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, |
| - multi_user_util::IsProfileFromActiveUser(browser->profile()) |
| - ? ash::TYPE_DIALOG |
| - : ash::TYPE_UNDEFINED); |
| + aura_window->SetProperty<int>( |
|
sky
2017/03/03 15:41:42
If you need a cast it should match how the propert
yiyix
2017/03/03 16:25:12
true, easier to understand. Thanks.
Done
|
| + ash::kShelfItemTypeKey, |
| + multi_user_util::IsProfileFromActiveUser(browser->profile()) |
| + ? ash::TYPE_DIALOG |
| + : ash::TYPE_UNDEFINED); |
| } |
| } |