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

Unified Diff: chrome/test/pyautolib/pyauto.py

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/test/pyautolib/pyauto.py
===================================================================
--- chrome/test/pyautolib/pyauto.py (revision 108608)
+++ chrome/test/pyautolib/pyauto.py (working copy)
@@ -3621,7 +3621,7 @@
self.PROXY_TYPE_PAC: 'Automatic proxy configuration' }
return values[proxy_type]
- def GetProxySettingsOnChromeOS(self):
+ def GetProxySettingsOnChromeOS(self, windex=0):
"""Get current proxy settings on Chrome OS.
Returns:
@@ -3648,9 +3648,9 @@
pyauto_errors.JSONInterfaceError if the automation call returns an error.
"""
cmd_dict = { 'command': 'GetProxySettings' }
- return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+ return self._GetResultFromJSONRequest(cmd_dict, windex=windex)
- def SetProxySettingsOnChromeOS(self, key, value):
+ def SetProxySettingsOnChromeOS(self, key, value, windex=0):
"""Set a proxy setting on Chrome OS.
Owner must be logged in for these to persist.
@@ -3702,7 +3702,7 @@
'key': key,
'value': value,
}
- return self._GetResultFromJSONRequest(cmd_dict, windex=-1)
+ return self._GetResultFromJSONRequest(cmd_dict, windex=windex)
def ForgetWifiNetwork(self, service_path):
"""Forget a remembered network by its service path.
« chrome/browser/chromeos/proxy_config_service_impl.cc ('K') | « chrome/test/base/testing_profile.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698