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

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

Issue 132543003: Add LauncherItem for TaskManager Dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 6 years, 11 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
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_item_util.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4d3748c6af90d97193a73a46df992632c6248fcd..30e473cf037bc09714f1fe5046bd87e9f495fc52 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -45,6 +45,8 @@
#if defined(USE_ASH)
#include "ash/wm/window_util.h"
+#include "chrome/browser/ui/ash/launcher/launcher_item_util.h"
+#include "grit/ash_resources.h"
#endif
#if defined(OS_WIN)
@@ -524,6 +526,11 @@ void TaskManagerView::Show(Browser* browser) {
views::FocusManager* focus_manager = instance_->GetFocusManager();
if (focus_manager)
focus_manager->SetFocusedView(instance_->tab_table_);
+
+#if defined(USE_ASH)
+ CreateShelfItemForDialog(IDR_AURA_LAUNCHER_ICON_TASK_MANAGER,
+ instance_->GetWidget()->GetNativeWindow());
+#endif
}
// ButtonListener implementation.
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_item_util.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698