mash: Remove shelf util functions; use WmWindow properties.

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

 // Copyright 2016 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/extension_app_window_launcher_controller.h"
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_delegate.h"
 #include "ash/common/wm_shell.h"
-#include "ash/shelf/shelf_util.h"
+#include "ash/common/wm_window_property.h"
 #include "ash/wm/window_util.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/launcher/extension_app_window_launcher_item_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #include "extensions/common/extension.h"
+#include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 using extensions::AppWindow;
 using extensions::AppWindowRegistry;
 
 namespace {
 
 std::string GetLaunchId(AppWindow* app_window) {
   // Set launch_id default value to an empty string. If showInShelf parameter
   // is true or the window type is panel and the window key is not empty, its
@@ skipping 143 matching lines @@
         controller->set_image_set_by_controller(true);
       }
     } else {
       owner()->SetItemController(shelf_id, controller);
     }
 
     // We need to change the controller associated with app_shelf_id.
     app_controller_map_[app_shelf_id] = controller;
   }
   owner()->SetItemStatus(shelf_id, status);
-  ash::SetShelfIDForWindow(shelf_id, window);
+  ash::WmWindowAura::Get(window)->SetIntProperty(
+      ash::WmWindowProperty::SHELF_ID, shelf_id);
 }
 
 void ExtensionAppWindowLauncherController::UnregisterApp(aura::Window* window) {
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   DCHECK(window_iter != window_to_app_shelf_id_map_.end());
   std::string app_shelf_id = window_iter->second;
   window_to_app_shelf_id_map_.erase(window_iter);
   window->RemoveObserver(this);
 
@@ skipping 27 matching lines @@
   WindowToAppShelfIdMap::iterator window_iter =
       window_to_app_shelf_id_map_.find(window);
   if (window_iter == window_to_app_shelf_id_map_.end())
     return nullptr;
   AppControllerMap::iterator app_controller_iter =
       app_controller_map_.find(window_iter->second);
   if (app_controller_iter == app_controller_map_.end())
     return nullptr;
   return app_controller_iter->second;
 }