Remove the network config dialog extra border.

chrome/browser/chromeos/options/vpn_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/vpn_config_view.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 177 matching lines @@
     return l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_USER_CERT_NONE_INSTALLED);
   }
   return CertLibrary::Get()->GetCertDisplayStringAt(
       CertLibrary::CERT_TYPE_USER, index);
 }
 
 }  // namespace internal
 
 VPNConfigView::VPNConfigView(NetworkConfigView* parent, VirtualNetwork* vpn)
-    : ChildNetworkConfigView(parent, vpn) {
+    : ChildNetworkConfigView(parent, vpn),
+      title_(0) {
   Init(vpn);
 }
 
 VPNConfigView::VPNConfigView(NetworkConfigView* parent)
-    : ChildNetworkConfigView(parent) {
+    : ChildNetworkConfigView(parent),
+      title_(0) {
   Init(NULL);
 }
 
 VPNConfigView::~VPNConfigView() {
   CertLibrary::Get()->RemoveObserver(this);
 }
 
+string16 VPNConfigView::GetTitle() const {
+  DCHECK_NE(title_, 0);
+  return l10n_util::GetStringUTF16(title_);
+}
+
 views::View* VPNConfigView::GetInitiallyFocusedView() {
   // Put focus in the first editable field.
   if (server_textfield_)
     return server_textfield_;
   else if (service_textfield_)
     return service_textfield_;
   else if (provider_type_combobox_)
     return provider_type_combobox_;
   else if (psk_passphrase_textfield_ && psk_passphrase_textfield_->enabled())
     return psk_passphrase_textfield_;
@@ skipping 277 matching lines @@
     // Set the default provider type.
     provider_type_ = PROVIDER_TYPE_L2TP_IPSEC_PSK;
     // Provider Type is user selectable, so enable all controls during init.
     enable_psk_passphrase_ = true;
     enable_user_cert_ = true;
     enable_server_ca_cert_ = true;
     enable_otp_ = true;
     enable_group_name_ = true;
   }
 
-  // Title
-  layout->StartRow(0, column_view_set_id);
-  views::Label* title = new views::Label(l10n_util::GetStringUTF16(
-      vpn ? IDS_OPTIONS_SETTINGS_JOIN_VPN : IDS_OPTIONS_SETTINGS_ADD_VPN));
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  title->SetFont(rb.GetFont(ui::ResourceBundle::MediumFont));
-  layout->AddView(title, 5, 1);
-  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+  // Initialize the title string ID used for the dialog.
+  title_ = vpn ? IDS_OPTIONS_SETTINGS_JOIN_VPN : IDS_OPTIONS_SETTINGS_ADD_VPN;
 
   // Server label and input.
   // Only provide Server name when configuring a new VPN.
   if (!vpn) {
     layout->StartRow(0, column_view_set_id);
     layout->AddView(new views::Label(l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_VPN_SERVER_HOSTNAME)));
     server_textfield_ = new views::Textfield(views::Textfield::STYLE_DEFAULT);
     server_textfield_->SetController(this);
     layout->AddView(server_textfield_);
@@ skipping 375 matching lines @@
 
   property_ui_data->ParseOncProperty(
       network->ui_data().onc_source(), onc,
       base::StringPrintf("%s.%s.%s",
                          onc::network_config::kVPN,
                          dict_key.c_str(),
                          key.c_str()));
 }
 
 }  // namespace chromeos