Cleanups for DialogClientView, DialogClientViewTest.

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 "base/gtest_prod_util.h"
 #include "base/macros.h"
 #include "ui/base/ui_base_types.h"
@@ skipping 48 matching lines @@
 
   // ButtonListener implementation:
   void ButtonPressed(Button* sender, const ui::Event& event) override;
 
   void set_button_row_insets(const gfx::Insets& insets) {
     button_row_insets_ = insets;
   }
 
   void set_minimum_size(const gfx::Size& size) { minimum_size_ = size; }
 
- protected:
-  // For testing.
-  explicit DialogClientView(View* contents_view);
+ private:
+  bool has_dialog_buttons() const { return ok_button_ || cancel_button_; }
 
-  // Returns the DialogDelegate for the window. Virtual for testing.
-  virtual DialogDelegate* GetDialogDelegate() const;
-
-  // Create and add the extra view, if supplied by the delegate.
-  void CreateExtraView();
+  // Returns the DialogDelegate for the window.
+  DialogDelegate* GetDialogDelegate() const;
 
   // View implementation.
   void ChildPreferredSizeChanged(View* child) override;
   void ChildVisibilityChanged(View* child) override;
 
- private:
-  bool has_dialog_buttons() const { return ok_button_ || cancel_button_; }
-
   // Create a dialog button of the appropriate type.
   LabelButton* CreateDialogButton(ui::DialogButton type);
 
   // Update |button|'s text and enabled state according to the delegate's state.
   void UpdateButton(LabelButton* button, ui::DialogButton type);
 
   // Returns the height of the buttons.
   int GetButtonHeight() const;
 
   // Returns the height of the extra view.
   int GetExtraViewHeight() const;
 
   // Returns the height of the row containing the buttons and the extra view.
   int GetButtonsAndExtraViewRowHeight() const;
 
   // Returns the insets for the buttons and extra view, including the vertical
   // padding between them and the contents view.
   gfx::Insets GetButtonRowInsets() const;
 
   // Sets up the focus chain for the child views. This is required since the
   // delegate may choose to add/remove views at any time.
   void SetupFocusChain();
 
+  // Returns the spacing between the extra view and the ok/cancel buttons. 0 if
+  // no extra view. Otherwise uses GetExtraViewPadding() or the default padding.
+  int GetExtraViewSpacing() const;
+
+  // Creates or deletes any buttons that are required. Updates data members.
+  void SetupViews();
+
   // How much to inset the button row.
   gfx::Insets button_row_insets_;
 
   // The minimum size of this dialog, regardless of the size of its content
   // view.
   gfx::Size minimum_size_;
 
   // The dialog buttons.
   LabelButton* ok_button_ = nullptr;
   LabelButton* cancel_button_ = nullptr;
 
   // The extra view shown in the row of buttons; may be NULL.
   View* extra_view_ = nullptr;
 
   // True if we've notified the delegate the window is closing and the delegate
   // allowed 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 delegate_allowed_close_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_