mash: Fix shelf window property use in Chrome.

chrome/browser/ui/views/task_manager_view.cc

 // Copyright 2015 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/views/task_manager_view.h"
 
 #include <stddef.h>
 
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 16 matching lines @@
 #include "ui/views/border.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/table/table_view.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #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
+// Note: gn check complains here, despite the correct conditional //ash dep.
+#include "ash/common/shelf/shelf_item_types.h"    // nogncheck
+#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)
 #include "chrome/browser/shell_integration_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif  // defined(OS_WIN)
 
 namespace task_manager {
 
@@ skipping 43 matching lines @@
 
   g_task_manager_view->SelectTaskOfActiveTab(browser);
   g_task_manager_view->GetWidget()->Show();
 
   // Set the initial focus to the list of tasks.
   views::FocusManager* focus_manager = g_task_manager_view->GetFocusManager();
   if (focus_manager)
     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();
+  property_util::SetIntProperty(aura_window, ash::kShelfItemTypeKey,
+                                ash::TYPE_DIALOG);
+  property_util::SetIntProperty(aura_window, ash::kShelfIconResourceIdKey,
+                                IDR_ASH_SHELF_ICON_TASK_MANAGER);
 #endif
   return g_task_manager_view->table_model_.get();
 }
 
 // static
 void TaskManagerView::Hide() {
   if (g_task_manager_view)
     g_task_manager_view->GetWidget()->Close();
 }
 
@@ skipping 240 matching lines @@
   if (!g_browser_process->local_state())
     return;
 
   const base::DictionaryValue* dictionary =
       g_browser_process->local_state()->GetDictionary(GetWindowName());
   if (dictionary)
     dictionary->GetBoolean("always_on_top", &is_always_on_top_);
 }
 
 }  // namespace task_manager