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

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

Issue 10423006: Remove the web-ui task manager unused stuffs for non-ChromeOS. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove "webui_task_manager" and use "use_aura" instead. Created 8 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/cocoa/browser_window_cocoa.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
index ec84653cd1cc0f916247dd1f2ef897d77dd224b3..f0595e50f6c3afafcc85e23b94770649d0872c0b 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm
@@ -35,7 +35,6 @@
#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
#include "chrome/browser/ui/page_info_bubble.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/notification_source.h"
@@ -416,29 +415,11 @@ void BrowserWindowCocoa::ShowUpdateChromeDialog() {
}
void BrowserWindowCocoa::ShowTaskManager() {
-#if defined(WEBUI_TASK_MANAGER)
- TaskManagerDialog::Show();
-#else
- // Uses WebUI TaskManager when swiches is set. It is beta feature.
- if (TaskManagerDialog::UseWebUITaskManager()) {
- TaskManagerDialog::Show();
- } else {
- TaskManagerMac::Show(false);
- }
-#endif // defined(WEBUI_TASK_MANAGER)
+ TaskManagerMac::Show(false);
}
void BrowserWindowCocoa::ShowBackgroundPages() {
-#if defined(WEBUI_TASK_MANAGER)
- TaskManagerDialog::ShowBackgroundPages();
-#else
- // Uses WebUI TaskManager when swiches is set. It is beta feature.
- if (TaskManagerDialog::UseWebUITaskManager()) {
- TaskManagerDialog::ShowBackgroundPages();
- } else {
- TaskManagerMac::Show(true);
- }
-#endif // defined(WEBUI_TASK_MANAGER)
+ TaskManagerMac::Show(true);
}
void BrowserWindowCocoa::ShowBookmarkBubble(const GURL& url,
« no previous file with comments | « chrome/browser/task_manager/task_manager_browsertest_util.cc ('k') | chrome/browser/ui/gtk/browser_window_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698