Fix missing buttons on the Edit Bookmark dialog.

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 109 matching lines @@
 
   // Container view for the button row.
   ButtonRowContainer* button_row_container_ = 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;
 
-  // When true, prevents ViewHierarchyChanged() from clearing out data members.
-  bool preserve_button_row_data_members_ = false;
+  // When true, prevents ViewHierarchyChanged() from clearing out data members
+  // and spurious triggers to Layout() from extra views.

[Peter Kasting, 2017/03/08 11:33:17]

This comment is now overly specific, since the member affects more than
ViewHierarchyChanged().

Maybe "Used to prevent unnecessary/potentially harmful changes during
SetupLayout().  Everything will be manually updated afterwards."

[tapted, 2017/03/08 12:19:03]

Done.

+  bool adding_or_removing_views_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(DialogClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_DIALOG_CLIENT_VIEW_H_