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

chrome/browser/chromeos/status/network_menu.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/chromeos/status/network_menu.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 889 matching lines @@
 
 void MoreMenuModel::InitMenuItems(bool should_open_button_options) {
   // This gets called on initialization, so any changes should be reflected
   // in CrosMock::SetNetworkLibraryStatusAreaExpectations().
 
   menu_items_.clear();
   MenuItemVector link_items;
   MenuItemVector address_items;
 
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
-  bool oobe = !should_open_button_options;  // we don't show options for OOBE.
   bool connected = cros->Connected();  // always call for test expectations.
-  if (!oobe) {
-    int message_id = -1;
-    if (StatusAreaViewChromeos::IsBrowserMode())
-      message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG;
-    else if (connected)
-      message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG;
-    if (message_id != -1) {
-      link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
-                                    l10n_util::GetStringUTF16(message_id),
-                                    SkBitmap(), std::string(), FLAG_OPTIONS));
-    }
+
+  int message_id = -1;
+  if (StatusAreaViewChromeos::IsBrowserMode())
+    message_id = IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG;
+  else if (connected)
+    message_id = IDS_STATUSBAR_NETWORK_OPEN_PROXY_SETTINGS_DIALOG;
+  if (message_id != -1) {
+    link_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
+                                  l10n_util::GetStringUTF16(message_id),
+                                  SkBitmap(), std::string(), FLAG_OPTIONS));
   }
 
   if (connected) {
     std::string ip_address = cros->IPAddress();
     if (!ip_address.empty()) {
       address_items.push_back(MenuItem(ui::MenuModel::TYPE_COMMAND,
           ASCIIToUTF16(cros->IPAddress()), SkBitmap(), std::string(),
                        FLAG_DISABLED));
     }
   }
@@ skipping 112 matching lines @@
   std::string page = StringPrintf(
       "%s?servicePath=%s&networkType=%d&networkName=%s",
       chrome::kInternetOptionsSubPage,
       net::EscapeUrlEncodedData(network->service_path(), true).c_str(),
       network->type(),
       net::EscapeUrlEncodedData(network_name, false).c_str());
   browser->ShowOptionsTab(page);
 }
 
 }  // namespace chromeos