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

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

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/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index 1bc976a5d3357c0070810067f9965590af0ca921..305d551a3014a1ea320686fa9eee0c653bd32ede 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -75,7 +75,6 @@
#include "chrome/browser/ui/page_info_bubble.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/task_manager/task_manager_dialog.h"
#include "chrome/browser/web_applications/web_app.h"
#include "chrome/browser/website_settings.h"
#include "chrome/common/chrome_notification_types.h"
@@ -1054,29 +1053,11 @@ void BrowserWindowGtk::ShowUpdateChromeDialog() {
}
void BrowserWindowGtk::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 {
- TaskManagerGtk::Show(false);
- }
-#endif // defined(WEBUI_TASK_MANAGER)
+ TaskManagerGtk::Show(false);
}
void BrowserWindowGtk::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 {
- TaskManagerGtk::Show(true);
- }
-#endif // defined(WEBUI_TASK_MANAGER)
+ TaskManagerGtk::Show(true);
}
void BrowserWindowGtk::ShowBookmarkBubble(const GURL& url,
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_cocoa.mm ('k') | chrome/browser/ui/panels/panel_browser_window_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698