Merge 65776 - Add a cancel button to Task Manager.

BUG=chromium-os:8740
TEST=manually done.

Review URL: http://codereview.chromium.org/4651002

TBR=yusukes@google.com
Review URL: http://codereview.chromium.org/4708009

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@65777 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 0 deletions

diff --git a/chrome/browser/defaults.cc b/chrome/browser/defaults.cc
index 48ad842..b1c2820 100644
--- a/chrome/browser/defaults.cc
+++ b/chrome/browser/defaults.cc
@@ -31,6 +31,7 @@ const bool kSizeTabButtonToTopOfTabStrip = true;
 const bool kBootstrapSyncAuthentication = true;
 const bool kShowOtherBrowsersInAboutMemory = false;
 const bool kAlwaysOpenIncognitoWindow = true;
+const bool kShowCancelButtonInTaskManager = true;
 
 #elif defined(TOOLKIT_USES_GTK)
 
@@ -72,6 +73,7 @@ const bool kSizeTabButtonToTopOfTabStrip = false;
 const bool kBootstrapSyncAuthentication = false;
 const bool kShowOtherBrowsersInAboutMemory = true;
 const bool kAlwaysOpenIncognitoWindow = false;
+const bool kShowCancelButtonInTaskManager = false;
 #endif
 
 #if defined(OS_MACOSX)
diff --git a/chrome/browser/defaults.h b/chrome/browser/defaults.h
index 6e64fe6..adc8577 100644
--- a/chrome/browser/defaults.h
+++ b/chrome/browser/defaults.h
@@ -71,6 +71,9 @@ extern const bool kShowOtherBrowsersInAboutMemory;
 // Should always open incognito windows when started with --incognito switch?
 extern const bool kAlwaysOpenIncognitoWindow;
 
+// Should the close button be shown in the Task Manager dialog?
+extern const bool kShowCancelButtonInTaskManager;
+
 //=============================================================================
 // Runtime "const" - set only once after parsing command line option and should
 // never be modified after that.
diff --git a/chrome/browser/gtk/task_manager_gtk.cc b/chrome/browser/gtk/task_manager_gtk.cc
index c03db6b8..1fb18f6 100644
--- a/chrome/browser/gtk/task_manager_gtk.cc
+++ b/chrome/browser/gtk/task_manager_gtk.cc
@@ -19,6 +19,7 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/defaults.h"
 #include "chrome/browser/gtk/gtk_chrome_link_button.h"
 #include "chrome/browser/gtk/gtk_theme_provider.h"
 #include "chrome/browser/gtk/gtk_tree.h"
@@ -426,6 +427,12 @@ void TaskManagerGtk::Init() {
         kTaskManagerPurgeMemory);
   }
 
+  if (browser_defaults::kShowCancelButtonInTaskManager) {
+    gtk_dialog_add_button(GTK_DIALOG(dialog_),
+        l10n_util::GetStringUTF8(IDS_CLOSE).c_str(),
+        GTK_RESPONSE_DELETE_EVENT);
+  }
+
   gtk_dialog_add_button(GTK_DIALOG(dialog_),
       l10n_util::GetStringUTF8(IDS_TASK_MANAGER_KILL).c_str(),
       kTaskManagerResponseKill);