summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 21:50:45 +0000
committerchocobo@chromium.org <chocobo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-30 21:50:45 +0000
commit88908d6c5279e50382f835ffa159025025d7bc52 (patch)
tree4b18d9236e8371ee7eb42fab6d18230c37614ff4 /chrome/app
parent932671aa9a8c663bbcf5f816a1dc033220574850 (diff)
downloadchromium_src-88908d6c5279e50382f835ffa159025025d7bc52.zip
chromium_src-88908d6c5279e50382f835ffa159025025d7bc52.tar.gz
chromium_src-88908d6c5279e50382f835ffa159025025d7bc52.tar.bz2
Add UI for changing auto-connect option on network.
Fixed crashing bug and ethernet not updating bug. BUG=chromiumos:2896,2939,2996 TEST=manual, in network options dialog, the new auto-connect checkbox should now control whether or not we automatically connect to this network. Review URL: http://codereview.chromium.org/1755013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1ebb1a3..6952b22 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7363,6 +7363,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_PASSPHRASE" desc="In settings internet options, the label for the passphrase.">
Network key:
</message>
+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_AUTO_CONNECT" desc="In settings internet options, the label for the auto-connect checkbox.">
+ Auto-connect to this network
+ </message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DONE" desc="In settings internet options, the label for the button done.">
Done
</message>