Handle dialog acclerators explicitly; nix default button switching.

ui/views/window/dialog_client_view.h

 // 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.
 
 #ifndef UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 #define UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_
 
 #include "ui/base/ui_base_types.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/focus/focus_manager.h"
 #include "ui/views/window/client_view.h"
 
 namespace views {
 
 class DialogDelegate;
 class LabelButton;
 class Widget;
 
 // DialogClientView provides adornments for a dialog's content view, including
 // custom-labeled [OK] and [Cancel] buttons with [Enter] and [Esc] accelerators.
 // The view also displays the delegate's extra view alongside the buttons and
 // the delegate's footnote view below the buttons. The view appears like below.
 // NOTE: The contents view is not inset on the top or side client view edges.
 //   +------------------------------+
 //   |        Contents View         |
 //   +------------------------------+
 //   | [Extra View]   [OK] [Cancel] |
 //   | [      Footnote View       ] |
 //   +------------------------------+
-class VIEWS_EXPORT DialogClientView : public ClientView,
-                                      public ButtonListener,
-                                      public FocusChangeListener {
+class VIEWS_EXPORT DialogClientView : public ClientView, public ButtonListener {
  public:
   DialogClientView(Widget* widget, View* contents_view);
   virtual ~DialogClientView();
 
   // Accept or Cancel the dialog.
   void AcceptWindow();
   void CancelWindow();
 
   // Accessors in case the user wishes to adjust these buttons.
   LabelButton* ok_button() const { return ok_button_; }
   LabelButton* cancel_button() const { return cancel_button_; }
 
   // Update the dialog buttons to match the dialog's delegate.
   void UpdateDialogButtons();
 
   // ClientView implementation:
   virtual bool CanClose() OVERRIDE;
   virtual DialogClientView* AsDialogClientView() OVERRIDE;
   virtual const DialogClientView* AsDialogClientView() const OVERRIDE;
 
-  // FocusChangeListener implementation:
-  virtual void OnWillChangeFocus(View* focused_before,
-                                 View* focused_now) OVERRIDE;
-  virtual void OnDidChangeFocus(View* focused_before,
-                                View* focused_now) OVERRIDE;
-
   // View implementation:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     View* parent,
                                     View* child) OVERRIDE;
 
   // ButtonListener implementation:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
@@ skipping 23 matching lines @@
   // Returns the insets for the buttons and extra view.
   gfx::Insets GetButtonRowInsets() const;
 
   // Closes the widget.
   void Close();
 
   // The dialog buttons.
   LabelButton* ok_button_;
   LabelButton* cancel_button_;
 
-  // The button that is currently default; may be NULL.
-  LabelButton* default_button_;
-
-  // Observe |focus_manager_| to update the default button with focus changes.
-  FocusManager* focus_manager_;
-
   // The extra view shown in the row of buttons; may be NULL.
   View* extra_view_;
 
   // The footnote view shown below the buttons; may be NULL.
   View* footnote_view_;
 
   // True if we've notified the delegate the window is closing and the delegate
   // allosed the close. In some situations it's possible to get two closes (see
   // http://crbug.com/71940). This is used to avoid notifying the delegate
   // twice, which can have bad consequences.
   bool notified_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_