Views - dialog button defaultness shouldn't follow focus.

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 05e14b433ac8d45c26d1442449d1e8284e175703..1108904f5d519fd81f1e01b398fe39f990138a55 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -9,7 +9,6 @@
 #include "base/macros.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 {
@@ -30,8 +29,7 @@ class Widget;
 //   | [      Footnote View       ] |
 //   +------------------------------+
 class VIEWS_EXPORT DialogClientView : public ClientView,
-                                      public ButtonListener,
-                                      public FocusChangeListener {
+                                      public ButtonListener {
  public:
   DialogClientView(Widget* widget, View* contents_view);
   ~DialogClientView() override;
@@ -52,17 +50,12 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   DialogClientView* AsDialogClientView() override;
   const DialogClientView* AsDialogClientView() const override;
 
-  // FocusChangeListener implementation:
-  void OnWillChangeFocus(View* focused_before, View* focused_now) override;
-  void OnDidChangeFocus(View* focused_before, View* focused_now) override;
-
   // View implementation:
   gfx::Size GetPreferredSize() const override;
   void Layout() override;
   bool AcceleratorPressed(const ui::Accelerator& accelerator) override;
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
-  void NativeViewHierarchyChanged() override;
   void OnNativeThemeChanged(const ui::NativeTheme* theme) override;
 
   // ButtonListener implementation:
@@ -86,8 +79,6 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   void ChildVisibilityChanged(View* child) override;
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(DialogClientViewTest, FocusManager);
-
   bool has_dialog_buttons() const { return ok_button_ || cancel_button_; }
 
   // Create a dialog button of the appropriate type.
@@ -109,12 +100,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_;