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

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

Issue 2679643003: macviews: unhook task manager from --secondary-ui-md (Closed)
Patch Set: Created 3 years, 10 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 | « no previous file | no next file » | 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 5eb832b109b39746364b6cf651ed479c00e67669..178681ab230a6f625c119ebee54dc5451fbf01e1 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac.mm
@@ -26,7 +26,6 @@
#include "content/public/browser/notification_source.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util_mac.h"
-#include "ui/base/material_design/material_design_controller.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/gfx/image/image_skia_util_mac.h"
@@ -640,18 +639,10 @@ - (NSButton*)endProcessButtonForTesting {
// Declared in browser_dialogs.h.
task_manager::TaskManagerTableModel* ShowTaskManager(Browser* browser) {
- if (ui::MaterialDesignController::IsSecondaryUiMaterial())
- return chrome::ShowTaskManagerViews(browser);
-
return task_manager::TaskManagerMac::Show();
}
void HideTaskManager() {
- if (ui::MaterialDesignController::IsSecondaryUiMaterial()) {
- chrome::HideTaskManagerViews();
- return;
- }
-
task_manager::TaskManagerMac::Hide();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698