Fix favorite and auto_connect property usage.

chrome/browser/chromeos/dom_ui/network_menu_ui.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/dom_ui/network_menu_ui.h"
 
 #include "app/l10n_util.h"
 #include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 12 matching lines @@
 
 namespace {
 
 class NetworkMenuSourceDelegate : public chromeos::MenuSourceDelegate {
  public:
   virtual void AddLocalizedStrings(DictionaryValue* localized_strings) const {
     DCHECK(localized_strings);
 
     localized_strings->SetString("reconnect", l10n_util::GetStringUTF16(
         IDS_NETWORK_RECONNECT_TITLE));
-    localized_strings->SetString("remeber_this_network",
-        l10n_util::GetStringUTF16(IDS_NETWORK_REMEMBER_THIS_NETWORK_TITLE));

[Charlie Lee, 2010/11/15 19:42:52]

If this string is no longer needed, please remove it.

[kochi, 2010/11/16 05:47:24]

No one else is using.
Removed.

+    localized_strings->SetString("auto_connect_this_network",
+        l10n_util::GetStringUTF16(
+            IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT));
     localized_strings->SetString("ssid_prompt",
         l10n_util::GetStringUTF16(IDS_NETWORK_SSID_HINT));
     localized_strings->SetString("pass_prompt",
         l10n_util::GetStringUTF16(IDS_NETWORK_PASSWORD_HINT));
   }
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuHandler
@@ skipping 97 matching lines @@
   success = success && base::StringToInt(index_str, &index);
   if (!success) {
     LOG(WARNING) << "ModelAction called with no index from: "
                  << chrome::kChromeUINetworkMenu;
     return close_menu;
   }
   std::string passphrase;
   values->GetString(2, &passphrase);  // Optional
   std::string ssid;
   values->GetString(3, &ssid);  // Optional
-  int remember = -1;  // -1 indicates not set
-  std::string remember_str;
-  if (values->GetString(4, &remember_str))  // Optional
-    base::StringToInt(remember_str, &remember);
+  int auto_connect = -1;  // -1 indicates default action (auto connect)
+  std::string auto_connect_str;
+  if (values->GetString(4, &auto_connect_str))  // Optional
+    base::StringToInt(auto_connect_str, &auto_connect);
 
   if (action == "connect" || action == "reconnect") {
     close_menu = network_menu->ConnectToNetworkAt(index, passphrase, ssid,
-                                                  remember);
+                                                  auto_connect);
   } else {
     LOG(WARNING) << "Unrecognized action: " << action
                  << " from: " << chrome::kChromeUINetworkMenu;
   }
   return close_menu;
 }
 
 DictionaryValue* NetworkMenuUI::CreateMenuItem(const menus::MenuModel* model,
                                                int index,
                                                const char* type,
@@ skipping 22 matching lines @@
 }
 
 views::Menu2* NetworkMenuUI::CreateMenu2(menus::MenuModel* model) {
   views::Menu2* menu = new views::Menu2(model);
   NativeMenuDOMUI::SetMenuURL(
       menu, GURL(StringPrintf("chrome://%s", chrome::kChromeUINetworkMenu)));
   return menu;
 }
 
 }  // namespace chromeos