[cros] Return proxy-settings back to the network menu list for OOBE.

chrome/browser/ui/webui/chromeos/login/network_dropdown.cc

 // Copyright (c) 2011 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/ui/webui/chromeos/login/network_dropdown.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 74 matching lines @@
     }
     if (type == ui::MenuModel::TYPE_SUBMENU)
       item->Set("sub", ConvertMenuModel(model->GetSubmenuModelAt(i)));
     list->Append(item);
   }
   return list;
 }
 
 // NetworkDropdown -------------------------------------------------------------
 
-NetworkDropdown::NetworkDropdown(WebUI* web_ui, gfx::NativeWindow parent_window)
+NetworkDropdown::NetworkDropdown(WebUI* web_ui,
+                                 gfx::NativeWindow parent_window, bool oobe)
     : parent_window_(parent_window),
-      web_ui_(web_ui) {
+      web_ui_(web_ui),
+      oobe_(oobe) {
   network_menu_.reset(new NetworkMenuWebUI(this, web_ui));
   network_icon_.reset(
       new NetworkMenuIcon(this, NetworkMenuIcon::DROPDOWN_MODE));
   CrosLibrary::Get()->GetNetworkLibrary()->AddNetworkManagerObserver(this);
   Refresh();
 }
 
 NetworkDropdown::~NetworkDropdown() {
   CrosLibrary::Get()->GetNetworkLibrary()->RemoveNetworkManagerObserver(this);
 }
@@ skipping 13 matching lines @@
 
 void NetworkDropdown::OpenButtonOptions() {
   if (proxy_settings_dialog_.get() == NULL) {
     proxy_settings_dialog_.reset(
         new ProxySettingsDialog(this, GetNativeWindow()));
   }
   proxy_settings_dialog_->Show();
 }
 
 bool NetworkDropdown::ShouldOpenButtonOptions() const {
-  return false;
+  return !oobe_;
 }
 
 void NetworkDropdown::OnNetworkManagerChanged(NetworkLibrary* cros) {
   Refresh();
 }
 
 void NetworkDropdown::Refresh() {
   SetNetworkIconAndText();
   network_menu_->UpdateMenu();
 }
@@ skipping 11 matching lines @@
   std::string icon_str =
       icon_bitmap.empty() ?
           std::string() : web_ui_util::GetImageDataUrl(icon_bitmap);
   base::StringValue title(text);
   base::StringValue icon(icon_str);
   web_ui_->CallJavascriptFunction("cr.ui.DropDown.updateNetworkTitle",
                                   title, icon);
 }
 
 }  // namespace chromeos