diff options
| -rw-r--r-- | build/common.gypi | 10 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 5 | ||||
| -rw-r--r-- | chrome/chrome_browser.gypi | 5 | ||||
| -rw-r--r-- | chrome/chrome_tests.gypi | 5 | ||||
| -rw-r--r-- | chrome/nacl.gypi | 3 | ||||
| -rw-r--r-- | chrome/renderer/render_view_browsertest.cc | 3 | ||||
| -rw-r--r-- | views/views.gyp | 5 |
7 files changed, 11 insertions, 25 deletions
diff --git a/build/common.gypi b/build/common.gypi index b21398cd..0ed4972 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -529,6 +529,16 @@ }], # OS==win ], # conditions for coverage }], # coverage!=0 + ['OS=="win"', { + 'defines': [ + '__STD_C', + '_CRT_SECURE_NO_DEPRECATE', + '_SCL_SECURE_NO_DEPRECATE', + ], + 'include_dirs': [ + '<(DEPTH)/third_party/wtl/include', + ], + }], # OS==win ], # conditions for 'target_defaults' 'target_conditions': [ ['chromium_code==0', { diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9ca394c..a81b2fa 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -619,11 +619,6 @@ # end up using this module as well. 'conditions': [ ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index b7291ab..9d82ce4 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -3335,11 +3335,6 @@ ], }], ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'include_dirs': [ '<(DEPTH)/third_party/wtl/include', ], diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0b97eec..421b784 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -1501,11 +1501,6 @@ ], }], ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'dependencies': [ 'chrome_dll_version', 'installer_util_strings', diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index e61dbbf..f3a179d 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -35,9 +35,6 @@ 'conditions': [ ['OS=="win"', { 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', '__STDC_LIMIT_MACROS=1', ], 'include_dirs': [ diff --git a/chrome/renderer/render_view_browsertest.cc b/chrome/renderer/render_view_browsertest.cc index 8c9d9c6..f5539b4 100644 --- a/chrome/renderer/render_view_browsertest.cc +++ b/chrome/renderer/render_view_browsertest.cc @@ -495,8 +495,7 @@ TEST_F(RenderViewTest, OnPrintPageAsBitmap) { // Test that we can receive correct DOM events when we send input events // through the RenderWidget::OnHandleInputEvent() function. TEST_F(RenderViewTest, OnHandleKeyboardEvent) { - // TODO(phajdan.jr): enable on Window when sprintf is removed. -#if defined(OS_LINUX) +#if defined(OS_WIN) || defined(OS_LINUX) // Load an HTML page consisting of one <input> element and three // contentediable <div> elements. // The <input> element is used for sending keyboard events, and the <div> diff --git a/views/views.gyp b/views/views.gyp index 130e351..9e56eef 100644 --- a/views/views.gyp +++ b/views/views.gyp @@ -360,11 +360,6 @@ ], }], ['OS=="win"', { - 'defines': [ - '__STD_C', - '_CRT_SECURE_NO_DEPRECATE', - '_SCL_SECURE_NO_DEPRECATE', - ], 'sources!': [ 'controls/slider/slider.cc', 'controls/slider/slider.h', |