summaryrefslogtreecommitdiffstats
path: root/base/base.gypi
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 21:53:41 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-25 21:53:41 +0000
commit5ac07d5b0325c446b3f114755cd4c95c55f0ee41 (patch)
tree52cbce4ec8f33156ff71ef03e445b897d859f5ef /base/base.gypi
parent40e99cd3f0570cd13b87e523d95fe253193f8c10 (diff)
downloadchromium_src-5ac07d5b0325c446b3f114755cd4c95c55f0ee41.zip
chromium_src-5ac07d5b0325c446b3f114755cd4c95c55f0ee41.tar.gz
chromium_src-5ac07d5b0325c446b3f114755cd4c95c55f0ee41.tar.bz2
Effectively revert r50648 (code review URL
http://codereview.chromium.org/2849018/show), except a minor change to sha1_portable.cc. Don't use sha1_win.cc because it may have caused a regression to page cycler moz. TBR=eroman BUG=47218 TEST=none Review URL: http://codereview.chromium.org/2865021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50900 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gypi')
-rw-r--r--base/base.gypi4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/base.gypi b/base/base.gypi
index db55e02..ba41fa5 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -349,7 +349,9 @@
'event_recorder_stubs.cc',
'file_descriptor_shuffle.cc',
'message_pump_libevent.cc',
- 'sha1_portable.cc',
+ # Not using sha1_win.cc because it may have caused a
+ # regression to page cycler moz.
+ 'sha1_win.cc',
'string16.cc',
'trace_event.cc',
],