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

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

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/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc (revision 108608)
+++ chrome/browser/automation/testing_automation_provider.cc (working copy)
@@ -2348,10 +2348,6 @@
handler_map["NetworkScan"] = &TestingAutomationProvider::NetworkScan;
handler_map["ToggleNetworkDevice"] =
&TestingAutomationProvider::ToggleNetworkDevice;
- handler_map["GetProxySettings"] =
- &TestingAutomationProvider::GetProxySettings;
- handler_map["SetProxySettings"] =
- &TestingAutomationProvider::SetProxySettings;
handler_map["ConnectToCellularNetwork"] =
&TestingAutomationProvider::ConnectToCellularNetwork;
handler_map["DisconnectFromCellularNetwork"] =
@@ -2547,6 +2543,10 @@
browser_handler_map["CaptureProfilePhoto"] =
&TestingAutomationProvider::CaptureProfilePhoto;
browser_handler_map["GetTimeInfo"] = &TestingAutomationProvider::GetTimeInfo;
+ browser_handler_map["GetProxySettings"] =
+ &TestingAutomationProvider::GetProxySettings;
+ browser_handler_map["SetProxySettings"] =
+ &TestingAutomationProvider::SetProxySettings;
#endif // defined(OS_CHROMEOS)
// Look for command in handlers that take a Browser handle.

Powered by Google App Engine
This is Rietveld 408576698