summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 19:04:14 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-11 19:04:14 +0000
commiteed7f7a557c3c41882cef755c93341db4888010f (patch)
tree25beb373e00bd1e79094b693e8bf0711d5d5f5c6 /chrome/browser
parent699ef2feeec529378709e06e8ec19b52f7ace7e4 (diff)
downloadchromium_src-eed7f7a557c3c41882cef755c93341db4888010f.zip
chromium_src-eed7f7a557c3c41882cef755c93341db4888010f.tar.gz
chromium_src-eed7f7a557c3c41882cef755c93341db4888010f.tar.bz2
[Windows] Clear Browsing Data dialog should not have any button as default
action. Also makes the behavior in Windows side act the same as in Linux/Mac. Patch by Thiago Farina <thiago.farina@gmail.com> BUG=21461 TEST=open "clear browsing data" and see if none of buttons are set as default. Code review URL: http://codereview.chromium.org/201080 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25992 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/views/clear_browsing_data.cc4
-rw-r--r--chrome/browser/views/clear_browsing_data.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc
index e5716e5..619592f 100644
--- a/chrome/browser/views/clear_browsing_data.cc
+++ b/chrome/browser/views/clear_browsing_data.cc
@@ -256,6 +256,10 @@ void ClearBrowsingDataView::ViewHierarchyChanged(bool is_add,
////////////////////////////////////////////////////////////////////////////////
// ClearBrowsingDataView, views::DialogDelegate implementation:
+int ClearBrowsingDataView::GetDefaultDialogButton() const {
+ return MessageBoxFlags::DIALOGBUTTON_NONE;
+}
+
std::wstring ClearBrowsingDataView::GetDialogButtonLabel(
MessageBoxFlags::DialogButton button) const {
if (button == MessageBoxFlags::DIALOGBUTTON_OK) {
diff --git a/chrome/browser/views/clear_browsing_data.h b/chrome/browser/views/clear_browsing_data.h
index c045038..61375d2 100644
--- a/chrome/browser/views/clear_browsing_data.h
+++ b/chrome/browser/views/clear_browsing_data.h
@@ -51,6 +51,7 @@ class ClearBrowsingDataView : public views::View,
views::View* child);
// Overridden from views::DialogDelegate:
+ virtual int GetDefaultDialogButton() const;
virtual std::wstring GetDialogButtonLabel(
MessageBoxFlags::DialogButton button) const;
virtual bool IsDialogButtonEnabled(