Handle dialog acclerators explicitly; nix default button switching.

ui/views/window/dialog_client_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/window/dialog_client_view.h"
 
 #include <algorithm>
 
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/views/controls/button/label_button.h"
@@ skipping 25 matching lines @@
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, public:
 
 DialogClientView::DialogClientView(Widget* owner, View* contents_view)
     : ClientView(owner, contents_view),
       ok_button_(NULL),
       cancel_button_(NULL),
-      default_button_(NULL),
-      focus_manager_(NULL),
       extra_view_(NULL),
       footnote_view_(NULL),
       notified_delegate_(false) {
   // When using the new style, the background color is set on the bubble frame,
   // so a transparent background is fine.
   if (!DialogDelegate::UseNewStyle()) {
     const SkColor color = owner->GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_DialogBackground);
     set_background(views::Background::CreateSolidBackground(color));
   }
+
+  // Add accelerators for the return and escape keys.
+  AddAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
+  AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
 }
 
-DialogClientView::~DialogClientView() {
-  if (focus_manager_)
-    focus_manager_->RemoveFocusChangeListener(this);
-  focus_manager_ = NULL;
-}
+DialogClientView::~DialogClientView() {}
 
 void DialogClientView::AcceptWindow() {
   // Only notify the delegate once. See |notified_delegate_|'s comment.
   if (!notified_delegate_ && GetDialogDelegate()->Accept(false)) {
     notified_delegate_ = true;
     Close();
   }
 }
 
 void DialogClientView::CancelWindow() {
   // Call the standard Close handler, which checks with the delegate before
   // proceeding. This checking _isn't_ done here, but in the WM_CLOSE handler,
   // so that the close box on the window also shares this code path.
   Close();
 }
 
 void DialogClientView::UpdateDialogButtons() {
   DialogDelegate* dialog = GetDialogDelegate();
   const int buttons = dialog->GetDialogButtons();
-  ui::Accelerator escape(ui::VKEY_ESCAPE, ui::EF_NONE);
 
   if (buttons & ui::DIALOG_BUTTON_OK) {
     if (!ok_button_) {
       ok_button_ = CreateDialogButton(ui::DIALOG_BUTTON_OK);
-      if (buttons & ui::DIALOG_BUTTON_CANCEL)
-        ok_button_->AddAccelerator(escape);
       AddChildView(ok_button_);
     }
 
     UpdateButton(ok_button_, dialog, ui::DIALOG_BUTTON_OK);
   } else if (ok_button_) {
     delete ok_button_;
     ok_button_ = NULL;
   }
 
   if (buttons & ui::DIALOG_BUTTON_CANCEL) {
     if (!cancel_button_) {
       cancel_button_ = CreateDialogButton(ui::DIALOG_BUTTON_CANCEL);
-      cancel_button_->AddAccelerator(escape);
       AddChildView(cancel_button_);
     }
 
     UpdateButton(cancel_button_, dialog, ui::DIALOG_BUTTON_CANCEL);
   } else if (cancel_button_) {
     delete cancel_button_;
     cancel_button_ = NULL;
   }
-
-  // Use the escape key to close the window if there are no dialog buttons.
-  if (!has_dialog_buttons())
-    AddAccelerator(escape);
-  else
-    ResetAccelerators();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // DialogClientView, ClientView overrides:
 
 bool DialogClientView::CanClose() {
   if (notified_delegate_)
     return true;
 
   DialogDelegate* dialog = GetDialogDelegate();
   int buttons = dialog->GetDialogButtons();
   bool close = true;
   if ((buttons & ui::DIALOG_BUTTON_CANCEL) ||
       (buttons == ui::DIALOG_BUTTON_NONE))
     close = dialog->Cancel();
   else if (buttons & ui::DIALOG_BUTTON_OK)
     close = dialog->Accept(true);
   notified_delegate_ = close;
   return close;
 }
 
 DialogClientView* DialogClientView::AsDialogClientView() {
   return this;
 }
 
 const DialogClientView* DialogClientView::AsDialogClientView() const {
   return this;
 }
 
-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;
-  if (focused_now &&
-      (focused_now->GetClassName() == LabelButton::kViewClassName)) {
-    new_default_button = static_cast<LabelButton*>(focused_now);
-  } else if (default_button == ui::DIALOG_BUTTON_OK && ok_button_) {
-    new_default_button = ok_button_;
-  } else if (default_button == ui::DIALOG_BUTTON_CANCEL && cancel_button_) {
-    new_default_button = cancel_button_;
-  }
-
-  if (default_button_ && default_button_ != new_default_button)
-    default_button_->SetIsDefault(false);
-  default_button_ = new_default_button;
-  if (default_button_ && !default_button_->is_default())
-    default_button_->SetIsDefault(true);
-}
-
-void DialogClientView::OnDidChangeFocus(View* focused_before,
-                                        View* focused_now) {
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, View overrides:
 
 gfx::Size DialogClientView::GetPreferredSize() {
   // Initialize the size to fit the buttons and extra view row.
   gfx::Size size(
       (ok_button_ ? ok_button_->GetPreferredSize().width() : 0) +
       (cancel_button_ ? cancel_button_->GetPreferredSize().width() : 0) +
       (cancel_button_ && ok_button_ ? kRelatedButtonHSpacing : 0) +
       (ShouldShow(extra_view_) ? extra_view_->GetPreferredSize().width() : 0) +
@@ skipping 71 matching lines @@
   }
 
   // Layout the contents view to the top and side edges of the contents bounds.
   // NOTE: The local insets do not apply to the contents view sides or top.
   const gfx::Rect contents_bounds = GetContentsBounds();
   contents_view()->SetBounds(contents_bounds.x(), contents_bounds.y(),
       contents_bounds.width(), bounds.bottom() - contents_bounds.y());
 }
 
 bool DialogClientView::AcceleratorPressed(const ui::Accelerator& accelerator) {
-  DCHECK_EQ(accelerator.key_code(), ui::VKEY_ESCAPE);
-  Close();
-  return true;
+  if (accelerator.key_code() == ui::VKEY_ESCAPE) {
+    if (!cancel_button_ || !cancel_button_->AcceleratorPressed(accelerator))
+      CancelWindow();
+    return true;
+  }
+
+  if (accelerator.key_code() == ui::VKEY_RETURN) {
+    View* focused = GetFocusManager()->GetFocusedView();
+    const int default_button_id = GetDialogDelegate()->GetDefaultDialogButton();
+    Button* default_button = ok_button_;
+    if (default_button_id == ui::DIALOG_BUTTON_CANCEL && cancel_button_)
+      default_button = cancel_button_;
+    if (!(focused && focused->GetClassName() == LabelButton::kViewClassName &&
+          focused->AcceleratorPressed(accelerator)) &&
+        !(default_button && default_button->AcceleratorPressed(accelerator)))
+      AcceptWindow();
+    return true;
+  }
+
+  NOTREACHED();
+  return false;
 }
 
 void DialogClientView::ViewHierarchyChanged(bool is_add,
                                             View* parent,
                                             View* child) {
   ClientView::ViewHierarchyChanged(is_add, parent, child);
   if (is_add && child == this) {
-    focus_manager_ = GetFocusManager();
-    if (focus_manager_)
-      GetFocusManager()->AddFocusChangeListener(this);
-
     UpdateDialogButtons();
     CreateExtraView();
     CreateFootnoteView();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, ButtonListener implementation:
 
 void DialogClientView::ButtonPressed(Button* sender, const ui::Event& event) {
   // Check for a valid delegate to avoid handling events after destruction.
   if (!GetDialogDelegate())
     return;
 
   if (sender == ok_button_)
     AcceptWindow();
   else if (sender == cancel_button_)
     CancelWindow();
   else
     NOTREACHED();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, protected:
 
 DialogClientView::DialogClientView(View* contents_view)
     : ClientView(NULL, contents_view),
       ok_button_(NULL),
       cancel_button_(NULL),
-      default_button_(NULL),
-      focus_manager_(NULL),
       extra_view_(NULL),
       footnote_view_(NULL),
       notified_delegate_(false) {}
 
 DialogDelegate* DialogClientView::GetDialogDelegate() const {
   return GetWidget()->widget_delegate()->AsDialogDelegate();
 }
 
 void DialogClientView::CreateExtraView() {
   if (extra_view_)
@@ skipping 15 matching lines @@
     AddChildView(footnote_view_);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // DialogClientView, private:
 
 LabelButton* DialogClientView::CreateDialogButton(ui::DialogButton type) {
   const string16 title = GetDialogDelegate()->GetDialogButtonLabel(type);
   LabelButton* button = new LabelButton(this, title);
   button->SetStyle(Button::STYLE_NATIVE_TEXTBUTTON);
-  button->set_focusable(true);
 
   const int kDialogMinButtonWidth = 75;
   button->set_min_size(gfx::Size(kDialogMinButtonWidth, 0));
   button->SetGroup(kButtonGroup);
   if (type == GetDialogDelegate()->GetDefaultDialogButton()) {
-    default_button_ = button;
+    // Make the button appear default, but handle the return key in this view.
     button->SetIsDefault(true);
+    button->RemoveAccelerator(ui::Accelerator(ui::VKEY_RETURN, ui::EF_NONE));
   }
   return button;
 }
 
 int DialogClientView::GetButtonsAndExtraViewRowHeight() const {
   int extra_view_height = ShouldShow(extra_view_) ?
       extra_view_->GetPreferredSize().height() : 0;
   int buttons_height = std::max(
       ok_button_ ? ok_button_->GetPreferredSize().height() : 0,
       cancel_button_ ? cancel_button_->GetPreferredSize().height() : 0);
@@ skipping 10 matching lines @@
       gfx::Insets(0, kButtonHEdgeMargin,
                   kButtonVEdgeMargin, kButtonHEdgeMargin);
 }
 
 void DialogClientView::Close() {
   GetWidget()->Close();
   GetDialogDelegate()->OnClose();
 }
 
 }  // namespace views