Add proxy settings to network control at upper row of controls at login screen.

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>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/keyboard_switch_menu.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
+#include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h"
 #include "chrome/browser/chromeos/status/network_dropdown_button.h"
 #include "gfx/size.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
 #include "views/controls/throbber.h"
@@ skipping 46 matching lines @@
 // Vertical addition to the menu window to make it appear exactly below
 // MenuButton.
 const int kMenuVerticalOffset = -1;
 
 // 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;
 
-// Hints for size of proxy settings dialog.
-static const int kProxySettingsDialogReasonableWidth = 750;
-static const int kProxySettingsDialogReasonableHeight = 460;
-static const int kProxySettingsDialogReasonableWidthRatio = 0.4;
-static const int kProxySettingsDialogReasonableHeightRatio = 0.4;
-
 // Initializes menu button default properties.
 static void InitMenuButtonProperties(views::MenuButton* menu_button) {
   menu_button->SetFocusable(true);
   menu_button->SetNormalHasBorder(true);
   menu_button->SetEnabledColor(SK_ColorBLACK);
   menu_button->SetHighlightColor(SK_ColorBLACK);
   menu_button->SetHoverColor(SK_ColorBLACK);
   menu_button->set_animate_on_state_change(false);
   // Menu is positioned by bottom right corner of the MenuButton.
   menu_button->set_menu_offset(kMenuHorizontalOffset, kMenuVerticalOffset);
@@ skipping 332 matching lines @@
 bool NetworkSelectionView::IsContinueEnabled() const {
   return continue_button_ && continue_button_->IsEnabled();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::LinkController implementation:
 
 void NetworkSelectionView::LinkActivated(views::Link* source, int) {
   if (source == proxy_settings_link_) {
     if (!proxy_settings_dialog_.get()) {
-      static const char kProxySettingsURL[] =
-          "chrome://settings/proxy?menu=off";
-      proxy_settings_dialog_.reset(new LoginHtmlDialog(
-          this,
-          GetNativeWindow(),
-          std::wstring(),
-          GURL(kProxySettingsURL),
-          LoginHtmlDialog::STYLE_BUBBLE));
-      gfx::Rect screen_bounds(chromeos::CalculateScreenBounds(gfx::Size()));
-      proxy_settings_dialog_->SetDialogSize(
-          std::min(
-              screen_bounds.width(),
-              std::max(kProxySettingsDialogReasonableWidth, static_cast<int>(
-                  kProxySettingsDialogReasonableWidthRatio *
-                      screen_bounds.width()))),
-          std::min(
-              screen_bounds.height(),
-              std::max(kProxySettingsDialogReasonableHeight, static_cast<int>(
-                  kProxySettingsDialogReasonableHeightRatio *
-                      screen_bounds.height()))));
+      proxy_settings_dialog_.reset(
+          new ProxySettingsDialog(this, GetNativeWindow()));
     }
     proxy_settings_dialog_->Show();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkSelectionView, private:
 
 void NetworkSelectionView::RecreateNativeControls() {
   // There is no way to get native button preferred size after the button was
   // sized so delete and recreate the button on text update.
   bool is_continue_enabled = IsContinueEnabled();
   delete continue_button_;
   continue_button_ = new views::NativeButton(
       delegate_,
       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