Move wifi/wimax/vpn config title from titlebar to dialog body

BUG=130195
TEST=Heading for connect to wifi/vpn/wimax should appear in bold in the dialog body, not in the titlebar (see issue).


Review URL: https://chromiumcodereview.appspot.com/10659017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146904 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 27 insertions, 32 deletions

diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc
index ae45121..48bea5c 100644
--- a/chrome/browser/chromeos/options/network_config_view.cc
+++ b/chrome/browser/chromeos/options/network_config_view.cc
@@ -187,10 +187,6 @@ views::View* NetworkConfigView::GetContentsView() {
   return this;
 }
 
-string16 NetworkConfigView::GetWindowTitle() const {
-  return child_config_view_->GetTitle();
-}
-
 void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->name =
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS);
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
index 58dcfde..7000b27 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -64,7 +64,6 @@ class NetworkConfigView : public views::DialogDelegateView,
   // views::WidgetDelegate methods.
   virtual ui::ModalType GetModalType() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
-  virtual string16 GetWindowTitle() const OVERRIDE;
 
   // views::View overrides.
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
@@ -122,9 +121,6 @@ class ChildNetworkConfigView : public views::View {
       : parent_(parent) {}
   virtual ~ChildNetworkConfigView() {}
 
-  // Called to get title for parent NetworkConfigView dialog box.
-  virtual string16 GetTitle() = 0;
-
   // Returns view that should be focused on dialog activation.
   virtual views::View* GetInitiallyFocusedView() = 0;
 
diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc
index 42d06f6..b351ff7 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.cc
+++ b/chrome/browser/chromeos/options/vpn_config_view.cc
@@ -212,13 +212,6 @@ VPNConfigView::~VPNConfigView() {
     cert_library_->RemoveObserver(this);
 }
 
-string16 VPNConfigView::GetTitle() {
-  if (service_path_.empty())
-    return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_ADD_VPN);
-  else
-    return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_JOIN_VPN);
-}
-
 views::View* VPNConfigView::GetInitiallyFocusedView() {
   // Put focus in the first editable field.
   if (server_textfield_)
@@ -481,7 +474,7 @@ void VPNConfigView::Init(VirtualNetwork* vpn) {
   if (!cert_library_->CertificatesLoaded())
     cert_library_->AddObserver(this);
 
-  int column_view_set_id = 0;
+  const int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   // Label.
   column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL, 1,
@@ -514,6 +507,14 @@ void VPNConfigView::Init(VirtualNetwork* vpn) {
     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));
+  title->SetFont(title->font().DeriveFont(1, gfx::Font::BOLD));
+  layout->AddView(title, 5, 1);
+  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+
   // Server label and input.
   // Only provide Server name when configuring a new VPN.
   if (!vpn) {
diff --git a/chrome/browser/chromeos/options/vpn_config_view.h b/chrome/browser/chromeos/options/vpn_config_view.h
index ab8362f..bf265ae 100644
--- a/chrome/browser/chromeos/options/vpn_config_view.h
+++ b/chrome/browser/chromeos/options/vpn_config_view.h
@@ -58,7 +58,6 @@ class VPNConfigView : public ChildNetworkConfigView,
   virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE;
 
   // ChildNetworkConfigView:
-  virtual string16 GetTitle() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual bool CanLogin() OVERRIDE;
   virtual bool Login() OVERRIDE;
diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc
index 6dbb85e..16bb8e1 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.cc
+++ b/chrome/browser/chromeos/options/wifi_config_view.cc
@@ -380,10 +380,6 @@ WifiConfigView::~WifiConfigView() {
     cert_library_->RemoveObserver(this);
 }
 
-string16 WifiConfigView::GetTitle() {
-  return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_JOIN_WIFI_NETWORKS);
-}
-
 views::View* WifiConfigView::GetInitiallyFocusedView() {
   // Return a reasonable widget for initial focus,
   // depending on what we're showing.
@@ -884,7 +880,7 @@ void WifiConfigView::Init(WifiNetwork* wifi, bool show_8021x) {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
-  int column_view_set_id = 0;
+  const int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   const int kPasswordVisibleWidth = 20;
   // Label
@@ -900,6 +896,14 @@ void WifiConfigView::Init(WifiNetwork* wifi, bool show_8021x) {
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, kPasswordVisibleWidth);
 
+  // Title
+  layout->StartRow(0, column_view_set_id);
+  views::Label* title = new views::Label(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_JOIN_WIFI_NETWORKS));
+  title->SetFont(title->font().DeriveFont(1, gfx::Font::BOLD));
+  layout->AddView(title, 5, 1);
+  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+
   // SSID input
   layout->StartRow(0, column_view_set_id);
   layout->AddView(new views::Label(l10n_util::GetStringUTF16(
diff --git a/chrome/browser/chromeos/options/wifi_config_view.h b/chrome/browser/chromeos/options/wifi_config_view.h
index 8afb554..d477291 100644
--- a/chrome/browser/chromeos/options/wifi_config_view.h
+++ b/chrome/browser/chromeos/options/wifi_config_view.h
@@ -66,7 +66,6 @@ class WifiConfigView : public ChildNetworkConfigView,
   virtual void OnCertificatesLoaded(bool initial_load) OVERRIDE;
 
   // ChildNetworkConfigView:
-  virtual string16 GetTitle() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual bool CanLogin() OVERRIDE;
   virtual bool Login() OVERRIDE;
diff --git a/chrome/browser/chromeos/options/wimax_config_view.cc b/chrome/browser/chromeos/options/wimax_config_view.cc
index ecd77be..ed29ecc 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.cc
+++ b/chrome/browser/chromeos/options/wimax_config_view.cc
@@ -46,13 +46,6 @@ WimaxConfigView::WimaxConfigView(NetworkConfigView* parent, WimaxNetwork* wimax)
 WimaxConfigView::~WimaxConfigView() {
 }
 
-string16 WimaxConfigView::GetTitle() {
-  // TODO(stevenjb): Replace this generic "Connect to network..." string with
-  // WiMAX-specific one.
-  return l10n_util::GetStringUTF16(
-      IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CONNECT_TITLE);
-}
-
 views::View* WimaxConfigView::GetInitiallyFocusedView() {
   if (identity_textfield_ && identity_textfield_->enabled())
     return identity_textfield_;
@@ -192,7 +185,7 @@ void WimaxConfigView::Init(WimaxNetwork* wimax) {
   views::GridLayout* layout = views::GridLayout::CreatePanel(this);
   SetLayoutManager(layout);
 
-  int column_view_set_id = 0;
+  const int column_view_set_id = 0;
   views::ColumnSet* column_set = layout->AddColumnSet(column_view_set_id);
   const int kPasswordVisibleWidth = 20;
   // Label
@@ -208,6 +201,14 @@ void WimaxConfigView::Init(WimaxNetwork* wimax) {
   column_set->AddColumn(views::GridLayout::CENTER, views::GridLayout::FILL, 1,
                         views::GridLayout::USE_PREF, 0, kPasswordVisibleWidth);
 
+  // Title
+  layout->StartRow(0, column_view_set_id);
+  views::Label* title = new views::Label(l10n_util::GetStringUTF16(
+      IDS_OPTIONS_SETTINGS_JOIN_WIMAX_NETWORKS));
+  title->SetFont(title->font().DeriveFont(1, gfx::Font::BOLD));
+  layout->AddView(title, 5, 1);
+  layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
+
   // Netowrk name
   layout->StartRow(0, column_view_set_id);
   layout->AddView(new views::Label(l10n_util::GetStringUTF16(
diff --git a/chrome/browser/chromeos/options/wimax_config_view.h b/chrome/browser/chromeos/options/wimax_config_view.h
index f896a9c..b83521e 100644
--- a/chrome/browser/chromeos/options/wimax_config_view.h
+++ b/chrome/browser/chromeos/options/wimax_config_view.h
@@ -45,7 +45,6 @@ class WimaxConfigView : public ChildNetworkConfigView,
                              const views::Event& event) OVERRIDE;
 
   // ChildNetworkConfigView:
-  virtual string16 GetTitle() OVERRIDE;
   virtual views::View* GetInitiallyFocusedView() OVERRIDE;
   virtual bool CanLogin() OVERRIDE;
   virtual bool Login() OVERRIDE;