Don't generate a certificate browse button or passphrase field if cert path contains SETTINGS:

chrome/browser/chromeos/options/network_config_view.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/options/ip_config_view.h"
 #include "chrome/browser/chromeos/options/wifi_config_view.h"
@@ skipping 97 matching lines @@
     return ASCIIToWide(wifi_.name());
   if (flags_ & FLAG_CELLULAR)
     return ASCIIToWide(cellular_.name());
   return l10n_util::GetString(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET);
 }
 
 void NetworkConfigView::TabSelectedAt(int index) {
 }
 
 void NetworkConfigView::SetLoginTextfieldFocus() {
-  wificonfig_view_->FocusFirstField();
+  if (wificonfig_view_)
+    wificonfig_view_->FocusFirstField();
 }
 
 void NetworkConfigView::Layout() {
   static const int kDialogBottomPadding = 7;
   tabs_->SetBounds(0, 0, width(), height() - kDialogBottomPadding);
 }
 
 gfx::Size NetworkConfigView::GetPreferredSize() {
   // TODO(chocobo): Once UI is finalized, create locale settings.
-  return gfx::Size(views::Window::GetLocalizedContentsSize(
+  gfx::Size result(views::Window::GetLocalizedContentsSize(
       IDS_IMPORT_DIALOG_WIDTH_CHARS,
       IDS_IMPORT_DIALOG_HEIGHT_LINES));
+  result.set_height(0);  // IMPORT_DIALOG height is too large
+  // Expand the default size to fit results if necessary
+  if (wificonfig_view_) {
+    gfx::Size s = wificonfig_view_->GetPreferredSize();
+    s.set_height(s.height() + kPanelVertMargin * 2);
+    s.set_width(s.width() + kPanelHorizMargin * 2);
+    result = gfx::Size(std::max(result.width(), s.width()),
+                       std::max(result.height(), s.height()));
+  }
+  if (ipconfig_view_) {
+    gfx::Size s = ipconfig_view_->GetPreferredSize();
+    s.set_height(s.height() + kPanelVertMargin * 2);
+    s.set_width(s.width() + kPanelHorizMargin * 2);
+    result = gfx::Size(std::max(result.width(), s.width()),
+                       std::max(result.height(), s.height()));
+  }
+  return result;
 }
 
 void NetworkConfigView::ViewHierarchyChanged(
     bool is_add, views::View* parent, views::View* child) {
   // Can't init before we're inserted into a Container, because we require
   // a HWND to parent native child controls to.
   if (is_add && child == this)
     Init();
 }
 
@@ skipping 19 matching lines @@
       ipconfig_view_ = new IPConfigView(cellular_.device_path());
     else
       ipconfig_view_ = new IPConfigView(ethernet_.device_path());
     tabs_->AddTab(
         l10n_util::GetString(IDS_OPTIONS_SETTINGS_SECTION_TITLE_IP_CONFIG),
         ipconfig_view_);
   }
 }
 
 }  // namespace chromeos