summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 15:04:46 +0000
committerkuan@chromium.org <kuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 15:04:46 +0000
commitc0a2128d9ebe63fd576ee9a34f137235240596ca (patch)
tree055290d7bd8272742ad2f8fcd9f53d007c74ade9 /chrome/app
parent57d3d993b1e9f530a1e7870042a2009084b179df (diff)
downloadchromium_src-c0a2128d9ebe63fd576ee9a34f137235240596ca.zip
chromium_src-c0a2128d9ebe63fd576ee9a34f137235240596ca.tar.gz
chromium_src-c0a2128d9ebe63fd576ee9a34f137235240596ca.tar.bz2
feature: implement proxy per network per user
- previously, proxy is per device i.e. one proxy for all networks for all users, and only owner can persist changes while non-owners can only change proxy during a session. - now, proxy is per network per user, i.e. each shared network can have a proxy for all users, each private network can have a proxy for each user, it's up to each user if he/she wants to use the proxies of shared networks. this cl does several things: - migrate previously persisted protobuf-formatted device signed settings to string property on flimflam for each network that becomes active (i.e. that is connected to). - proxy changes are no longer persisted as signed setting to device; instead proxies are persisted to flimflam and only for the specific network and for the logged-in user if network is private. - in oobe/login screen, proxy configuration is only for network that is currently active i.e. being connected to. so to change proxies of different networks, you have to first connect to the network, then open the proxy page. - after login, proxy configuration is only enabled for remembered private networks or where user chooses to use shared proxies of remembered shared networks, regardless if network is active or inactive. - after login, proxy section is removed from "Under the hood", and chrome://settings/proxy is no longer accessible. instead, on chrome://settings/internet, click on "Options" button of a network, in "Network" tab, if proxy is configurable, "Change proxy settings..." button will open the proxy page. - each time user connects to a different network successfully, proxy of that new network takes effect in the network stack, as will be reflected in chrome://net-internals/#proxy. bug: in proxy page, manual settings (http,https,ftp,socks) don't show up. - fixed in javascript. BUG=chromium-os:13052,chromium-os:15278,chromium-os:17409 TEST=verify that proxy can be modified for different connected networks in oobe/login and different active and inactive networks after-login, and the different proxies take effect when switching between networks. Review URL: http://codereview.chromium.org/7384016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index be7b281..9d9de08 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -10627,6 +10627,9 @@ ls' lab.">
<message name="IDS_OPTIONS_SETTINGS_ADD_VPN" desc="In the settings tab, the text on the button to add a private network.">
Add private network
</message>
+ <message name="IDS_OPTIONS_SETTINGS_USE_SHARED_PROXIES" desc="In the settings tab, the text next to the checkbox for using shared proxies.">
+ Use shared proxies
+ </message>
<message name="IDS_OPTIONS_SETTINGS_ENABLE_DATA_ROAMING" desc="In the settings tab, the text next to the checkbox for data roaming.">
Allow mobile data roaming
</message>
@@ -10852,6 +10855,9 @@ ls' lab.">
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER" desc="In settings Internet options, the label dns server.">
DNS server:
</message>
+ <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_CHANGE_PROXY_BUTTON" desc="For ethernet and remembered services, change proxy button text in chrome:settings/internet.">
+ Change proxy settings...
+ </message>
<message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_HARDWARE_ADDRESS" desc="In settings Internet options, the label hardware address.">
Hardware address:
</message>