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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/chromeos.gyp

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add SchemeToString Created 5 years, 5 months 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
« no previous file with comments | « chromeos/BUILD.gn ('k') | chromeos/network/DEPS » ('j') | chromeos/network/onc/onc_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/chromeos.gyp
diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index f5b3db082841723ca5bb404e9bae45acb9136f3e..18548aba89986795e5749077b3f283e120f79b80 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -545,6 +545,7 @@
'../components/components.gyp:cloud_policy_proto',
'../components/components.gyp:device_event_log_component',
'../components/components.gyp:onc_component',
+ '../components/components.gyp:proxy_config',
'../crypto/crypto.gyp:crypto',
'../dbus/dbus.gyp:dbus',
'../google_apis/google_apis.gyp:google_apis',
@@ -569,6 +570,7 @@
'type': 'static_library',
'dependencies': [
'../build/linux/system.gyp:dbus',
+ '../google_apis/google_apis.gyp:google_apis_test_support',
'../testing/gmock.gyp:gmock',
'chromeos',
'chromeos_test_support_without_gmock',
@@ -666,6 +668,7 @@
'../build/linux/system.gyp:dbus',
'../build/linux/system.gyp:ssl',
'../components/components.gyp:onc_component',
+ '../components/components.gyp:proxy_config',
'../crypto/crypto.gyp:crypto',
'../crypto/crypto.gyp:crypto_test_support',
'../dbus/dbus.gyp:dbus_test_support',
« no previous file with comments | « chromeos/BUILD.gn ('k') | chromeos/network/DEPS » ('j') | chromeos/network/onc/onc_utils.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698