[Harmony] Harmony Chrome OS Wifi dialog.

chrome/browser/chromeos/options/network_config_view.cc

Index: chrome/browser/chromeos/options/network_config_view.cc
diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index 9b1c9ef87deb86d08cd8521989689aedafc06e9e..9dd6990f3e291561fa50b083b5bba3bb43d87db9 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -69,6 +69,7 @@ gfx::NativeWindow GetParentForUnhostedDialog() {
 
 // static
 const int ChildNetworkConfigView::kInputFieldMinWidth = 270;
+const int ChildNetworkConfigView::kInputFieldHeight = 28;
 
 NetworkConfigView::NetworkConfigView()
     : child_config_view_(nullptr),
@@ -199,6 +200,10 @@ views::View* NetworkConfigView::GetInitiallyFocusedView() {
   return child_config_view_->GetInitiallyFocusedView();
 }
 
+int NetworkConfigView::GetDefaultDialogButton() const {
+  return ui::DIALOG_BUTTON_CANCEL;
+}
+
 base::string16 NetworkConfigView::GetWindowTitle() const {
   DCHECK(!child_config_view_->GetTitle().empty());
   return child_config_view_->GetTitle();
@@ -232,9 +237,13 @@ void NetworkConfigView::ShowAdvancedView() {
                                           true /* show_8021x */);
   AddChildView(child_config_view_);
   // Resize the window to be able to hold the new widgets.
-  gfx::Size size = views::Widget::GetLocalizedContentsSize(
+  gfx::Size size = GetWidget()->client_view()->GetPreferredSize();
+  gfx::Size predefined_size = views::Widget::GetLocalizedContentsSize(
       IDS_JOIN_WIFI_NETWORK_DIALOG_ADVANCED_WIDTH_CHARS,
       IDS_JOIN_WIFI_NETWORK_DIALOG_ADVANCED_MINIMUM_HEIGHT_LINES);
+  size.set_width(std::max(size.width(), predefined_size.width()));
+  size.set_height(std::max(size.height(), predefined_size.height()));

[oshima, 2017/01/27 22:09:18]

size.SetToMax

[xdai1, 2017/01/27 22:25:17]

Done.

+
   // Get the new bounds with desired size at the same center point.
   gfx::Rect bounds = GetWidget()->GetWindowBoundsInScreen();
   int horiz_padding = bounds.width() - size.width();