Handle dialog acclerators explicitly; nix default button switching.

ui/views/window/dialog_client_view.h

Index: ui/views/window/dialog_client_view.h
diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
index 32e80bec702c056657e5c77ff460b6f4ea3d62f5..ebf298afef3daafe2bad190fb7c2e939426ecd3f 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -7,7 +7,6 @@
 
 #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 {
@@ -27,9 +26,7 @@ class Widget;
 //   | [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();
@@ -50,12 +47,6 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   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;
@@ -99,12 +90,6 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   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_;