diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/chrome.gyp | 4 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_renderer.gypi | 1 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 6 | ||||
| -rw-r--r-- | chrome/service/cloud_print/print_system_win.cc | 2 |
5 files changed, 14 insertions, 0 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 27e71b0..1c41e72 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -424,6 +424,7 @@ 'chrome_strings', '../base/base.gyp:base', '../net/net.gyp:http_server', + '../net/net.gyp:net', 'theme_resources', 'theme_resources_standard', '../skia/skia.gyp:skia', @@ -534,6 +535,7 @@ '../base/base.gyp:base', '../build/temp_gyp/googleurl.gyp:googleurl', '../jingle/jingle.gyp:notifier', + '../net/net.gyp:net', '../third_party/icu/icu.gyp:icuuc', '../third_party/sqlite/sqlite.gyp:sqlite', 'app/policy/cloud_policy_codegen.gyp:policy', @@ -801,6 +803,7 @@ 'dependencies': [ 'sync', '../jingle/jingle.gyp:notifier', + '../net/net.gyp:net', '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation', ], # This target exports a hard dependency because it depends on @@ -821,6 +824,7 @@ 'common_net', '../base/base.gyp:base', '../jingle/jingle.gyp:notifier', + '../net/net.gyp:net', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', '../third_party/libjingle/libjingle.gyp:libjingle', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 23015c2..717215e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -35,6 +35,7 @@ '../content/content.gyp:content_browser', '../crypto/crypto.gyp:crypto', '../media/media.gyp:media', + '../net/net.gyp:net', '../ppapi/ppapi_internal.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi index 90fea9c..abc994f 100644 --- a/chrome/chrome_renderer.gypi +++ b/chrome/chrome_renderer.gypi @@ -16,6 +16,7 @@ 'safe_browsing_proto', '../content/content.gyp:content_renderer', '../content/content.gyp:content_plugin', + '../net/net.gyp:net', '../ppapi/ppapi_internal.gyp:ppapi_proxy', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 258d53a..9adb2c4 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -36,6 +36,7 @@ '../content/content.gyp:content_gpu', '../ipc/ipc.gyp:test_support_ipc', '../media/media.gyp:media_test_support', + '../net/net.gyp:net', # 'test/test_url_request_context_getter.h' brings in this requirement. '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', @@ -451,6 +452,7 @@ 'test_support_common', 'test_support_ui', '../third_party/hunspell/hunspell.gyp:hunspell', + '../net/net.gyp:net', '../net/net.gyp:net_resources', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', @@ -1199,6 +1201,7 @@ '../gpu/gpu.gyp:gpu_unittest_utils', '../jingle/jingle.gyp:jingle_glue_test_util', '../media/media.gyp:media_test_support', + '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -2252,6 +2255,7 @@ '../base/base.gyp:base', '../base/base.gyp:base_i18n', '../base/base.gyp:test_support_base', + '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', @@ -3195,6 +3199,7 @@ 'common', 'debugger', '../jingle/jingle.gyp:notifier_test_util', + '../net/net.gyp:net', '../skia/skia.gyp:skia', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', @@ -3281,6 +3286,7 @@ 'renderer', 'chrome_strings', 'test_support_common', + '../net/net.gyp:net', '../net/net.gyp:net_test_support', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 3c3dfd1..84ad4929 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -31,6 +31,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" +#pragma comment(lib, "rpcrt4.lib") // for UuidToString & Co. + namespace { class DevMode { |