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

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

Issue 332163006: Manage settings window icon for multi profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browsertest Created 6 years, 6 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/settings_window_manager.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 45fe2c1a47ce4ae370e01aad6ba354cb3872b166..92a82e3d37ada21c511fafa170dbc63ad71be735 100644
--- a/chrome/browser/ui/views/task_manager_view.cc
+++ b/chrome/browser/ui/views/task_manager_view.cc
@@ -41,8 +41,8 @@
#include "ui/views/window/dialog_delegate.h"
#if defined(USE_ASH)
+#include "ash/shelf/shelf_util.h"
#include "ash/wm/window_util.h"
-#include "chrome/browser/ui/ash/launcher/launcher_item_util.h"
#include "grit/ash_resources.h"
#endif
@@ -496,8 +496,9 @@ void TaskManagerView::Show(Browser* browser) {
focus_manager->SetFocusedView(instance_->tab_table_);
#if defined(USE_ASH)
- CreateShelfItemForDialog(IDR_ASH_SHELF_ICON_TASK_MANAGER,
- instance_->GetWidget()->GetNativeWindow());
+ ash::SetShelfItemDetailsForDialogWindow(
+ instance_->GetWidget()->GetNativeWindow(),
+ IDR_ASH_SHELF_ICON_TASK_MANAGER);
#endif
}
« no previous file with comments | « chrome/browser/ui/settings_window_manager.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698