Implement Harmony-style consistent button widths for Collected Cookies.

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"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/window/client_view.h"
 
 namespace views {
+namespace test {
+class TestDialogClientView;
+}
 
 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. The
 // view appears like below. NOTE: The contents view is not inset on the top or
 // side client view edges.
@@ skipping 34 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:
+  friend class test::TestDialogClientView;
+
+  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();
-
   // 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;
 
+  // Installs and configures the LayoutManager. Does not add any views.
+  void SetupLayout();
+
+  // First removes all child views, creates or deletes any buttons that are
+  // required. Then adds the contents view, buttons and ExtraView (if any) to
+  // the LayoutManager.
+  void SetupViews();
+
   // 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();
 
   // 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_;
@@ skipping 10 matching lines @@
   // 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_