Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4256)

Unified Diff: chrome/browser/ui/views/task_manager_view.cc

Issue 2357143004: mash: Support ShelfWindowWatcher via ShelfItem properties. (Closed)
Patch Set: Address comments. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 513934e7a7322fdd50317b390513253d74da28c5..ba09251951a93c765242979e80dc937a3c4bf8f6 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -105,11 +105,10 @@ task_manager::TaskManagerTableModel* TaskManagerView::Show(Browser* browser) {
#if defined(USE_ASH)
ash::WmWindow* wm_window = ash::WmLookup::Get()->GetWindowForWidget(
g_task_manager_view->GetWidget());
- ash::ShelfItemDetails item_details;
- item_details.type = ash::TYPE_DIALOG;
- item_details.image_resource_id = IDR_ASH_SHELF_ICON_TASK_MANAGER;
- item_details.title = wm_window->GetTitle();
- wm_window->SetShelfItemDetails(item_details);
+ 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);
#endif
return g_task_manager_view->table_model_.get();
}

Powered by Google App Engine
This is Rietveld 408576698