diff options
| author | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 08:28:07 +0000 |
|---|---|---|
| committer | yoshiki@chromium.org <yoshiki@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-05 08:28:07 +0000 |
| commit | 7b937360dc15b2746cc601620a33a7273a4eb86b (patch) | |
| tree | 63a6ad4c67f0892a934fa95f1a4b3e2d879359b8 /chrome/browser/ui/gtk/browser_window_gtk.cc | |
| parent | ab6641369e8bbb14d51548fc38848c5885ec0fd6 (diff) | |
| download | chromium_src-7b937360dc15b2746cc601620a33a7273a4eb86b.zip chromium_src-7b937360dc15b2746cc601620a33a7273a4eb86b.tar.gz chromium_src-7b937360dc15b2746cc601620a33a7273a4eb86b.tar.bz2 | |
WebUI TaskManager: Support on Mac & Linux
WebUI TaskManager is enabled when "--enable-task-manager" command-line option is set or when chrome is built with WEBUI_TASK_MANAGER.
The title and close button are shown only when task manager is a dialog and chrome runs on ChromeOS.
BUG=69222
TEST=manual
Review URL: http://codereview.chromium.org/8115005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/gtk/browser_window_gtk.cc')
| -rw-r--r-- | chrome/browser/ui/gtk/browser_window_gtk.cc | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index a762c93..a0c1b50 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -72,6 +72,7 @@ #include "chrome/browser/ui/omnibox/omnibox_view.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/webui/bug_report_ui.h" +#include "chrome/browser/ui/webui/task_manager_dialog.h" #include "chrome/browser/ui/window_sizer.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_notification_types.h" @@ -958,11 +959,31 @@ void BrowserWindowGtk::ShowUpdateChromeDialog() { } void BrowserWindowGtk::ShowTaskManager() { - TaskManagerGtk::Show(false); +#if defined(WEBUI_TASK_MANAGER) + TaskManagerDialog::Show(); +#else + // Uses WebUI TaskManager when swiches is set. It is beta feature. + if (CommandLine::ForCurrentProcess() + ->HasSwitch(switches::kEnableWebUITaskManager)) { + TaskManagerDialog::Show(); + } else { + TaskManagerGtk::Show(false); + } +#endif // defined(WEBUI_TASK_MANAGER) } void BrowserWindowGtk::ShowBackgroundPages() { - TaskManagerGtk::Show(true); +#if defined(WEBUI_TASK_MANAGER) + TaskManagerDialog::ShowBackgroundPages(); +#else + // Uses WebUI TaskManager when swiches is set. It is beta feature. + if (CommandLine::ForCurrentProcess() + ->HasSwitch(switches::kEnableWebUITaskManager)) { + TaskManagerDialog::ShowBackgroundPages(); + } else { + TaskManagerGtk::Show(true); + } +#endif // defined(WEBUI_TASK_MANAGER) } void BrowserWindowGtk::ShowBookmarkBubble(const GURL& url, |