Merge 62674 - First round UI touch up of DOMUI based network menu....

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_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chromeos/status/network_menu.h"
 #include "chrome/browser/chromeos/views/native_menu_domui.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
+#include "grit/generated_resources.h"
 #include "views/controls/menu/menu_2.h"
 
 namespace {
 
 ////////////////////////////////////////////////////////////////////////////////
 //
 // MenuHandler
 //
 ////////////////////////////////////////////////////////////////////////////////
 
@@ skipping 43 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 
 NetworkMenuUI::NetworkMenuUI(TabContents* contents)
     : chromeos::MenuUI(
         contents,
         ALLOW_THIS_IN_INITIALIZER_LIST(
             CreateMenuUIHTMLSource(*this,
                                    chrome::kChromeUINetworkMenu,
                                    "NetworkMenu",
                                    IDR_NETWORK_MENU_JS,
-                                   -1))) {
+                                   IDR_NETWORK_MENU_CSS))) {
   NetworkMenuHandler* handler = new NetworkMenuHandler();
   AddMessageHandler((handler)->Attach(this));
 }
 
 void NetworkMenuUI::AddCustomConfigValues(DictionaryValue* config) const {
 }
 
+void NetworkMenuUI::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));
+  localized_strings->SetString("ssid_prompt",
+      l10n_util::GetStringUTF16(IDS_NETWORK_SSID_HINT));
+  localized_strings->SetString("pass_prompt",
+      l10n_util::GetStringUTF16(IDS_NETWORK_PASSWORD_HINT));
+}
+
 void NetworkMenuUI::ModelAction(const menus::MenuModel* model,
                                 const ListValue* values) {
   //const NetworkMenu* network_menu = static_cast<const NetworkMenu*>(model);
   // Invoke model methods here.
 }
 
 DictionaryValue* NetworkMenuUI::CreateMenuItem(const menus::MenuModel* model,
                                                int index,
                                                const char* type,
                                                int* max_icon_width,
@@ skipping 20 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