summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-13 05:04:26 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-13 05:04:26 +0000
commit14c5d52a45602e685f662469715fc690d596e536 (patch)
treeb31de8b2a35d404d1c4fd8bbc27d73adacd60222 /ui
parentc4c2312cfcb4ca3ca875384bb3fc3026ac8e4916 (diff)
downloadchromium_src-14c5d52a45602e685f662469715fc690d596e536.zip
chromium_src-14c5d52a45602e685f662469715fc690d596e536.tar.gz
chromium_src-14c5d52a45602e685f662469715fc690d596e536.tar.bz2
Change new-dialog-style default buttons on focus too.
This behavior is expected and required of dialogs, regardless of style. Fixes DefaultButtonTest.DialogDefaultButtonTest for the new dialog style. BUG=166075 TEST=New dialog style default buttons follow focus. TBR=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/15061004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/window/dialog_client_view.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 72f550e..ef10fc4 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -146,11 +146,6 @@ const DialogClientView* DialogClientView::AsDialogClientView() const {
void DialogClientView::OnWillChangeFocus(View* focused_before,
View* focused_now) {
- // New style dialogs do not move the default button with the focus.
- // TODO(msw|wittman): Remove this functionality once the new style has landed.
- if (DialogDelegate::UseNewStyle())
- return;
-
// Make the newly focused button default or restore the dialog's default.
const int default_button = GetDialogDelegate()->GetDefaultDialogButton();
LabelButton* new_default_button = NULL;