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

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

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Restore AppLaunchId class via using ShelfID = AppLaunchId; cleanup. Created 3 years, 7 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 333c97b48024897f671cae46f414e77d4612bc31..4d6e12b31a343ca2f89c82914b54d1a494d29bd2 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -103,6 +103,9 @@ task_manager::TaskManagerTableModel* TaskManagerView::Show(Browser* browser) {
#if defined(USE_ASH)
aura::Window* window = g_task_manager_view->GetWidget()->GetNativeWindow();
+ // An app id for task manager windows, also used to identify the shelf item.
+ static constexpr const char kTaskManagerAppID[] = "Task Manager";
James Cook 2017/05/04 16:38:49 ditto
msw 2017/05/04 19:05:58 Done.
+ window->SetProperty(ash::kShelfIDKey, new ash::ShelfID(kTaskManagerAppID));
window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
gfx::ImageSkia* icon = rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_TASK_MANAGER);

Powered by Google App Engine
This is Rietveld 408576698