Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(303)

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc

Issue 547703004: Some JS cleanup, including proper ownership of ONC properties. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_279351_internet_options_8b
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_stri ngs.h" 5 #include "chrome/browser/ui/webui/options/chromeos/internet_options_handler_stri ngs.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "grit/ash_strings.h" 10 #include "grit/ash_strings.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 IDS_OPTIONS_SETTINGS_INTERNET_AUTOMATIC_NAME_SERVERS}, 99 IDS_OPTIONS_SETTINGS_INTERNET_AUTOMATIC_NAME_SERVERS},
100 {"userNameServer1", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_1}, 100 {"userNameServer1", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_1},
101 {"userNameServer2", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_2}, 101 {"userNameServer2", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_2},
102 {"userNameServer3", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_3}, 102 {"userNameServer3", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_3},
103 {"userNameServer4", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_4}, 103 {"userNameServer4", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVER_4},
104 {"googleNameServers", IDS_OPTIONS_SETTINGS_INTERNET_GOOGLE_NAME_SERVERS}, 104 {"googleNameServers", IDS_OPTIONS_SETTINGS_INTERNET_GOOGLE_NAME_SERVERS},
105 {"userNameServers", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVERS}, 105 {"userNameServers", IDS_OPTIONS_SETTINGS_INTERNET_USER_NAME_SERVERS},
106 {"hardwareAddress", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS}, 106 {"hardwareAddress", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS},
107 {"detailsInternetDismiss", IDS_CLOSE}, 107 {"detailsInternetDismiss", IDS_CLOSE},
108 {"activateButton", IDS_OPTIONS_SETTINGS_ACTIVATE}, 108 {"activateButton", IDS_OPTIONS_SETTINGS_ACTIVATE},
109 {"buyplanButton", IDS_OPTIONS_SETTINGS_BUY_PLAN},
110 {"connectButton", IDS_OPTIONS_SETTINGS_CONNECT}, 109 {"connectButton", IDS_OPTIONS_SETTINGS_CONNECT},
111 {"configureButton", IDS_OPTIONS_SETTINGS_CONFIGURE}, 110 {"configureButton", IDS_OPTIONS_SETTINGS_CONFIGURE},
112 {"disconnectButton", IDS_OPTIONS_SETTINGS_DISCONNECT}, 111 {"disconnectButton", IDS_OPTIONS_SETTINGS_DISCONNECT},
113 {"viewAccountButton", IDS_STATUSBAR_NETWORK_VIEW_ACCOUNT}, 112 {"viewAccountButton", IDS_STATUSBAR_NETWORK_VIEW_ACCOUNT},
114 {"wimaxConnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_WIMAX}, 113 {"wimaxConnTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_WIMAX},
115 114
116 // Wifi Tab. 115 // Wifi Tab.
117 {"inetSsid", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID}, 116 {"inetSsid", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_ID},
118 {"inetBssid", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_BSSID}, 117 {"inetBssid", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_NETWORK_BSSID},
119 {"inetEncryption", 118 {"inetEncryption",
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) { 183 void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
185 for (size_t i = 0; i < kStringResourcesLength; ++i) { 184 for (size_t i = 0; i < kStringResourcesLength; ++i) {
186 localized_strings->SetString( 185 localized_strings->SetString(
187 kStringResources[i].name, 186 kStringResources[i].name,
188 l10n_util::GetStringUTF16(kStringResources[i].id)); 187 l10n_util::GetStringUTF16(kStringResources[i].id));
189 } 188 }
190 } 189 }
191 190
192 } // namespace internet_options_strings 191 } // namespace internet_options_strings
193 } // namespace chromeos 192 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/chromeos/internet_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698