Fix missing buttons on the Edit Bookmark dialog.

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 ff184b877617cc44b1805a81a96ce10711dfc6c4..01faf827be2b50b149051f8db97573ab99c766d3 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -127,8 +127,9 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
   // twice, which can have bad consequences.
   bool delegate_allowed_close_ = false;
 
-  // When true, prevents ViewHierarchyChanged() from clearing out data members.
-  bool preserve_button_row_data_members_ = false;
+  // Used to prevent unnecessary or potentially harmful changes during
+  // SetupLayout(). Everything will be manually updated afterwards.
+  bool adding_or_removing_views_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };