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

Unified Diff: chrome/browser/ui/cocoa/task_manager_mac.mm

Issue 1922683003: Make old task manager tests work against new task manager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix OSX function call namespace Created 4 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
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/task_manager/task_manager_table_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/task_manager_mac.mm
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm
index 853389b8ed1722e2049339d5563eb6ef1e62a847..593527bf81cd3a82aff614e9b011353fd62f50d6 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -594,13 +594,12 @@ void TaskManagerMac::Hide() {
namespace chrome {
// Declared in browser_dialogs.h.
-void ShowTaskManager(Browser* browser) {
- if (chrome::ToolkitViewsDialogsEnabled()) {
- chrome::ShowTaskManagerViews(browser);
- return;
- }
+ui::TableModel* ShowTaskManager(Browser* browser) {
+ if (chrome::ToolkitViewsDialogsEnabled())
+ return chrome::ShowTaskManagerViews(browser);
TaskManagerMac::Show();
+ return nullptr; // No ui::TableModel* to return on Mac, so return nullptr.
}
void HideTaskManager() {
« no previous file with comments | « chrome/browser/ui/browser_dialogs.h ('k') | chrome/browser/ui/task_manager/task_manager_table_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698