mash: Fix shelf window property use in Chrome.

chrome/browser/ui/views/task_manager_view.cc

Index: chrome/browser/ui/views/task_manager_view.cc
diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc
index ba09251951a93c765242979e80dc937a3c4bf8f6..9bb463e7f46befc00dd46e7b5f1215252f2690c6 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -34,12 +34,11 @@
 #include "ui/views/window/dialog_client_view.h"
 
 #if defined(USE_ASH)
-#include "ash/common/shelf/shelf_item_types.h"  // nogncheck
-#include "ash/common/wm_lookup.h"               // nogncheck
-#include "ash/common/wm_window.h"               // nogncheck
-#include "ash/common/wm_window_property.h"      // nogncheck
-#include "ash/resources/grit/ash_resources.h"   // nogncheck
-#include "ash/wm/window_util.h"                 // nogncheck
+#include "ash/common/shelf/shelf_item_types.h"    // nogncheck

[James Cook, 2016/10/01 00:16:21]

Aside: Any idea why these are nogncheck? Is there no explicit dep from views ->
ash?

[msw, 2016/10/03 19:14:23]

gn check trips over the conditional here; I added a comment.

+#include "ash/resources/grit/ash_resources.h"     // nogncheck
+#include "ash/wm/window_properties.h"             // nogncheck
+#include "ash/wm/window_util.h"                   // nogncheck
+#include "chrome/browser/ui/ash/property_util.h"  // nogncheck
 #endif  // defined(USE_ASH)
 
 #if defined(OS_WIN)
@@ -103,12 +102,11 @@ task_manager::TaskManagerTableModel* TaskManagerView::Show(Browser* browser) {
     focus_manager->SetFocusedView(g_task_manager_view->tab_table_);
 
 #if defined(USE_ASH)
-  ash::WmWindow* wm_window = ash::WmLookup::Get()->GetWindowForWidget(
-      g_task_manager_view->GetWidget());
-  wm_window->SetIntProperty(ash::WmWindowProperty::SHELF_ITEM_TYPE,
-                            ash::TYPE_DIALOG);
-  wm_window->SetIntProperty(ash::WmWindowProperty::SHELF_ICON_RESOURCE_ID,
-                            IDR_ASH_SHELF_ICON_TASK_MANAGER);
+  aura::Window* aura_window =
+      g_task_manager_view->GetWidget()->GetNativeWindow();
+  SetIntProperty(aura_window, ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
+  SetIntProperty(aura_window, ash::kShelfIconResourceIdKey,
+                 IDR_ASH_SHELF_ICON_TASK_MANAGER);
 #endif
   return g_task_manager_view->table_model_.get();
 }