summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_browser_ui.gypi
diff options
context:
space:
mode:
authorpneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 21:31:34 +0000
committerpneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-19 21:31:34 +0000
commit21dc5ec7a3c65a78bb6e4047eba6ddac68d9e2e7 (patch)
tree580714e1a5bb49aea0d49f9acf7e27af4ca07e1e /chrome/chrome_browser_ui.gypi
parent511833408f73cacc044db20a5e8bb57bdc329e14 (diff)
downloadchromium_src-21dc5ec7a3c65a78bb6e4047eba6ddac68d9e2e7.zip
chromium_src-21dc5ec7a3c65a78bb6e4047eba6ddac68d9e2e7.tar.gz
chromium_src-21dc5ec7a3c65a78bb6e4047eba6ddac68d9e2e7.tar.bz2
Fixed proxy settings in case of simultaneously active device and user ONC policy.
This fix required the following changes: - Let Shill emit profile and proxy config changes. (see https://gerrit.chromium.org/gerrit/#/c/37935/) The active network's changes are automatically picked up by ProxyConfigTracker. - Make NetworkConfigurationUpdater an observer of the Manager's profile list (by implementing the new NetworkLibrary::NetworkProfileObserver class), so that the user policy is applied _after_ Shill has pushed the user profile. - Ensure in the NetworkConfigurationUpdater that the device policy is always overwritten by the user policy (if the former is applied, also apply the latter). Apart from that, I cleaned up the code a little bit. E.g. the following members of NetworkLibrary were unused: - FindRememberedNetworkByUniqueId - SetNetworkProfile - remembered_network_unique_id_map_ BUG=157642 TEST= - Setup both policies for the same SSID with different proxy settings. - Check that after login the right proxy is used. - Toggle AutoConnect of the device policy and reload the policy while still logged in. - Check that still the right proxy is used. Review URL: https://chromiumcodereview.appspot.com/11365225 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser_ui.gypi')
0 files changed, 0 insertions, 0 deletions