[Harmony] Harmony Chrome OS Wifi dialog.

chrome/browser/chromeos/options/network_config_view.cc

 // 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.
 
 #include "chrome/browser/chromeos/options/network_config_view.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 51 matching lines @@
     if (browser)
       return browser->window()->GetNativeWindow();
   }
   return nullptr;
 }
 
 }  // namespace
 
 // static
 const int ChildNetworkConfigView::kInputFieldMinWidth = 270;
+const int ChildNetworkConfigView::kInputFieldHeight = 28;
 
 NetworkConfigView::NetworkConfigView()
     : child_config_view_(nullptr),
       delegate_(nullptr),
       advanced_button_(nullptr) {
   DCHECK(!g_instance);
   g_instance = this;
 }
 
 bool NetworkConfigView::InitWithNetworkState(const NetworkState* network) {
@@ skipping 110 matching lines @@
 }
 
 views::View* NetworkConfigView::CreateExtraView() {
   return advanced_button_;
 }
 
 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();
 }
 
 ui::ModalType NetworkConfigView::GetModalType() const {
   return ui::MODAL_TYPE_SYSTEM;
 }
 
 void NetworkConfigView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
@@ skipping 13 matching lines @@
 void NetworkConfigView::ShowAdvancedView() {
   // Clear out the old widgets and build new ones.
   RemoveChildView(child_config_view_);
   delete child_config_view_;
   // For now, there is only an advanced view for Wi-Fi 802.1X.
   child_config_view_ = new WifiConfigView(this,
                                           "" /* service_path */,
                                           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();
   int vert_padding = bounds.height() - size.height();
   bounds.Inset(horiz_padding / 2, vert_padding / 2,
                horiz_padding / 2, vert_padding / 2);

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

ClampToCenteredSize

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

This function only shrinks to the smaller size, thus can't be used here.

[oshima, 2017/01/30 18:10:45]

Acknowledged.

   GetWidget()->SetBoundsConstrained(bounds);
   Layout();
   child_config_view_->InitFocus();
 }
 
 void NetworkConfigView::Layout() {
   child_config_view_->SetBounds(0, 0, width(), height());
 }
 
 gfx::Size NetworkConfigView::GetPreferredSize() const {
@@ skipping 75 matching lines @@
 }
 
 ControlledSettingIndicatorView::~ControlledSettingIndicatorView() {}
 
 gfx::Size ControlledSettingIndicatorView::GetPreferredSize() const {
   return (managed_ && visible()) ? image_view_->GetPreferredSize()
                                  : gfx::Size();
 }
 
 }  // namespace chromeos