Remove WmWindowProperty

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

 // Copyright (c) 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/browser_shortcut_launcher_item_controller.h"
 
 #include <limits>
 #include <vector>
 
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/common/wm_window_property.h"
 #include "ash/public/cpp/shelf_application_menu_item.h"
 #include "ash/resources/grit/ash_resources.h"
+#include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h"
 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
@@ skipping 144 matching lines @@
 
 void BrowserShortcutLauncherItemController::SetShelfIDForBrowserWindowContents(
     Browser* browser,
     content::WebContents* web_contents) {
   // We need to set the window ShelfID for V1 applications since they are
   // content which might change and as such change the application type.
   if (!browser || !IsBrowserFromActiveUser(browser) ||
       IsSettingsBrowser(browser))
     return;
 
-  ash::WmWindow::Get(browser->window()->GetNativeWindow())
-      ->SetIntProperty(
-          ash::WmWindowProperty::SHELF_ID,
-          launcher_controller()->GetShelfIDForWebContents(web_contents));
+  browser->window()->GetNativeWindow()->SetProperty(
+      ash::kShelfIDKey,
+      launcher_controller()->GetShelfIDForWebContents(web_contents));
 }
 
 ash::ShelfAction BrowserShortcutLauncherItemController::ItemSelected(
     ui::EventType event_type,
     int event_flags,
     int64_t display_id,
     ash::ShelfLaunchSource source) {
   if (event_flags & ui::EF_CONTROL_DOWN) {
     chrome::NewEmptyWindow(launcher_controller()->profile());
     return ash::SHELF_ACTION_NEW_WINDOW_CREATED;
@@ skipping 198 matching lines @@
   Browser* browser = content::Source<Browser>(source).ptr();
   DCHECK(browser);
   BrowserList::BrowserVector::iterator item = std::find(
       browser_menu_items_.begin(), browser_menu_items_.end(), browser);
   DCHECK(item != browser_menu_items_.end());
   // Clear the entry for the closed browser and leave other indices intact.
   *item = nullptr;
   registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING,
                     content::Source<Browser>(browser));
 }