Aligns the network menu width with combo box width.

chrome/browser/chromeos/login/network_selection_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/login/network_selection_view.h"
 
 #include <signal.h>
 #include <sys/types.h>
 #include <string>
 
@@ skipping 48 matching lines @@
 const int kControlPaddingRow = 15;
 
 // Fixed size for language/network controls height.
 const int kSelectionBoxHeight = 29;
 
 // Menu button is drawn using our custom icons in resources. See
 // TextButtonBorder::Paint() for details. So this offset compensate
 // horizontal size, eaten by those icons.
 const int kMenuHorizontalOffset = -1;
 
+// Constants were taken from 'views/controls/menu_button.cc'.
+const int kDefaultMenuOffsetX = -2;
+const int kDefaultMenuOffsetY = -4;
+
 // Vertical addition to the menu window to make it appear exactly below
 // MenuButton.
 const int kMenuVerticalOffset = 3;
 
 // Offset that compensates menu width so that it matches
 // menu button visual width when being in pushed state.
 const int kMenuWidthOffset = 6;
 
 const SkColor kWelcomeColor = 0xFFCDD3D6;
 
@@ skipping 124 matching lines @@
 
 void NetworkSelectionView::InitLayout() {
   gfx::Size screen_size = delegate_->size();
   const int widest_label = std::max(
       select_language_label_->GetPreferredSize().width(),
       select_network_label_->GetPreferredSize().width());
   const int dropdown_width = screen_size.width() - 2 * kBorderSize -
       2 * kPaddingColumnWidth - kMediumPaddingColumnWidth - widest_label;
   delegate_->language_switch_menu()->SetFirstLevelMenuWidth(
       dropdown_width - kMenuWidthOffset);
+  network_dropdown_->SetFirstLevelMenuWidth(dropdown_width - kMenuWidthOffset);
 
   // Define layout and column set for entire screen (welcome + screen).
   views::GridLayout* screen_layout = new views::GridLayout(this);
   SetLayoutManager(screen_layout);
   views::ColumnSet* column_set = screen_layout->AddColumnSet(WELCOME_ROW);
   const int welcome_width = screen_size.width() - 2 * kWelcomeTitlePadding -
       2 * kBorderSize;
   column_set->AddPaddingColumn(0, kWelcomeTitlePadding + kBorderSize);
   column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 0,
                         GridLayout::FIXED, welcome_width, welcome_width);
@@ skipping 58 matching lines @@
   welcome_label_->SetMultiLine(true);
 
   select_language_label_ = new views::Label();
   select_language_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
 
   languages_menubutton_ = new NotifyingMenuButton(
       NULL, std::wstring(), delegate_->language_switch_menu(), true, delegate_);
   languages_menubutton_->SetFocusable(true);
   languages_menubutton_->SetNormalHasBorder(true);
   // Menu is positioned by bottom right corner of the MenuButton.
+  // TODO(altimofeev): switch to the absolute offsets (button related)
   delegate_->language_switch_menu()->set_menu_offset(kMenuHorizontalOffset,
                                                      kMenuVerticalOffset);
 
   select_network_label_ = new views::Label();
   select_network_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
 
   network_dropdown_ = new NetworkControlWithAccelerators(false,
                                                          GetNativeWindow(),
                                                          delegate_);
+
+  // TODO(altimofeev): switch to the absolute offsets (button related)
+  network_dropdown_->set_menu_offset(
+      kDefaultMenuOffsetX + kMenuHorizontalOffset,
+      kDefaultMenuOffsetY + kMenuVerticalOffset);
+
   network_dropdown_->SetNormalHasBorder(true);
   network_dropdown_->SetFocusable(true);
 
   connecting_network_label_ = new views::Label();
   connecting_network_label_->SetFont(rb.GetFont(ResourceBundle::MediumFont));
   connecting_network_label_->SetVisible(false);
 
   proxy_settings_link_ = new views::Link();
   proxy_settings_link_->SetController(this);
   proxy_settings_link_->SetVisible(true);
@@ skipping 114 matching lines @@
       l10n_util::GetString(IDS_NETWORK_SELECTION_CONTINUE_BUTTON));
   continue_button_->SetEnabled(is_continue_enabled);
 }
 
 void NetworkSelectionView::UpdateConnectingNetworkLabel() {
   connecting_network_label_->SetText(l10n_util::GetStringF(
       IDS_NETWORK_SELECTION_CONNECTING, UTF16ToWide(network_id_)));
 }
 
 }  // namespace chromeos