Merge 62556 - Hide the keyboard menu until the language is changed.

BUG=chromium-os:6185
TEST=manually

Review URL: http://codereview.chromium.org/3768003

TBR=yusukes@chromium.org
Review URL: http://codereview.chromium.org/3761009

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@62693 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 7 deletions

diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc
index 4c3a2de..30aa75f 100644
--- a/chrome/browser/chromeos/login/network_selection_view.cc
+++ b/chrome/browser/chromeos/login/network_selection_view.cc
@@ -158,6 +158,7 @@ NetworkSelectionView::NetworkSelectionView(NetworkScreenDelegate* delegate)
       continue_button_(NULL),
       throbber_(CreateDefaultSmoothedThrobber()),
       proxy_settings_link_(NULL),
+      show_keyboard_button_(false),
       delegate_(delegate) {
 }
 
@@ -188,13 +189,16 @@ void NetworkSelectionView::AddControlsToLayout(const gfx::Size& size,
                     GridLayout::FILL, GridLayout::FILL,
                     languages_menubutton_->GetPreferredSize().width(),
                     kSelectionBoxHeight);
-    contents_layout->AddPaddingRow(0, kControlPaddingRow);
-    contents_layout->StartRow(0, STANDARD_ROW);
-    contents_layout->AddView(select_keyboard_label_);
-    contents_layout->AddView(keyboards_menubutton_, 1, 1,
-                    GridLayout::FILL, GridLayout::FILL,
-                    keyboards_menubutton_->GetPreferredSize().width(),
-                    kSelectionBoxHeight);
+    if (show_keyboard_button_) {
+      contents_layout->AddPaddingRow(0, kControlPaddingRow);
+      contents_layout->StartRow(0, STANDARD_ROW);
+      contents_layout->AddView(select_keyboard_label_);
+      contents_layout->AddView(
+          keyboards_menubutton_, 1, 1,
+          GridLayout::FILL, GridLayout::FILL,
+          keyboards_menubutton_->GetPreferredSize().width(),
+          kSelectionBoxHeight);
+    }
     contents_layout->AddPaddingRow(0, kControlPaddingRow);
     contents_layout->StartRow(0, STANDARD_ROW);
     contents_layout->AddView(select_network_label_);
@@ -372,6 +376,7 @@ void NetworkSelectionView::UpdateLocalizedStrings() {
 // views::View: implementation:
 
 void NetworkSelectionView::OnLocaleChanged() {
+  show_keyboard_button_ = true;
   UpdateLocalizedStrings();
   // Proxy settings dialog contains localized title.  Zap it.
   proxy_settings_dialog_.reset(NULL);
diff --git a/chrome/browser/chromeos/login/network_selection_view.h b/chrome/browser/chromeos/login/network_selection_view.h
index ffba7bd..a788e39 100644
--- a/chrome/browser/chromeos/login/network_selection_view.h
+++ b/chrome/browser/chromeos/login/network_selection_view.h
@@ -110,6 +110,7 @@ class NetworkSelectionView : public views::View,
   views::NativeButton* continue_button_;
   views::Throbber* throbber_;
   views::Link* proxy_settings_link_;
+  bool show_keyboard_button_;
 
   // NetworkScreen delegate.
   NetworkScreenDelegate* delegate_;