Remove WmWindowProperty

chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h"
 
 #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"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #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)
     : BrowserStatusMonitor(launcher_controller),
       launcher_controller_(launcher_controller) {
 }
 
 MultiProfileBrowserStatusMonitor::~MultiProfileBrowserStatusMonitor() {
 }
 
@@ skipping 40 matching lines @@
       }
     }
   }
 
   // Hide settings window shelf items not associated with this profile and
   // restore items for windows associated with the current profile.
   for (Browser* browser : *browser_list) {
     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));
     }
   }
 
   // Update the browser state since some of the removals / adds above might have
   // had an impact on the browser item.
   UpdateBrowserItemState();
 }
 
 void MultiProfileBrowserStatusMonitor::AddV1AppToShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
@@ skipping 27 matching lines @@
 
 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher(
     Browser* browser) {
   // Removing a V1 app from the launcher requires to remove the content and
   // the launcher item.
   launcher_controller_->UpdateAppState(
       browser->tab_strip_model()->GetActiveWebContents(),
       ChromeLauncherController::APP_STATE_REMOVED);
   BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
 }