diff options
Diffstat (limited to 'chrome')
55 files changed, 228 insertions, 148 deletions
diff --git a/chrome/app/chrome_dll.vcproj b/chrome/app/chrome_dll.vcproj index d22b95c..a232cf0 100644 --- a/chrome/app/chrome_dll.vcproj +++ b/chrome/app/chrome_dll.vcproj @@ -56,7 +56,7 @@ /> <Tool Name="VCLinkerTool" - AdditionalDependencies="$(OutDir)\lib\tcmalloc.lib" + AdditionalDependencies="$(OutDir)\obj\tcmalloc\libcmt.lib" OutputFile="$(IntDir)\chrome.dll" LinkIncremental="1" IgnoreDefaultLibraryNames="libcmtd.lib" @@ -230,7 +230,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc" > </File> <File diff --git a/chrome/app/locales/ar.vcproj b/chrome/app/locales/ar.vcproj index 2675cf6..e972e43 100644 --- a/chrome/app/locales/ar.vcproj +++ b/chrome/app/locales/ar.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ar.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ar.rc" > </File> <File diff --git a/chrome/app/locales/bg.vcproj b/chrome/app/locales/bg.vcproj index 2d173c0..beecc27 100644 --- a/chrome/app/locales/bg.vcproj +++ b/chrome/app/locales/bg.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_bg.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bg.rc" > </File> <File diff --git a/chrome/app/locales/bn.vcproj b/chrome/app/locales/bn.vcproj index 6d869ef..6f585cb 100644 --- a/chrome/app/locales/bn.vcproj +++ b/chrome/app/locales/bn.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_bn.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_bn.rc" > </File> <File diff --git a/chrome/app/locales/ca.vcproj b/chrome/app/locales/ca.vcproj index fd6767d..d5245f9 100644 --- a/chrome/app/locales/ca.vcproj +++ b/chrome/app/locales/ca.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ca.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ca.rc" > </File> <File diff --git a/chrome/app/locales/cs.vcproj b/chrome/app/locales/cs.vcproj index 0a2340f..b4fd610 100644 --- a/chrome/app/locales/cs.vcproj +++ b/chrome/app/locales/cs.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_cs.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_cs.rc" > </File> <File diff --git a/chrome/app/locales/da.vcproj b/chrome/app/locales/da.vcproj index d8681ca..9fbf9f7 100644 --- a/chrome/app/locales/da.vcproj +++ b/chrome/app/locales/da.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_da.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_da.rc" > </File> <File diff --git a/chrome/app/locales/de.vcproj b/chrome/app/locales/de.vcproj index 6590bef..8291075 100644 --- a/chrome/app/locales/de.vcproj +++ b/chrome/app/locales/de.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_de.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_de.rc" > </File> <File diff --git a/chrome/app/locales/el.vcproj b/chrome/app/locales/el.vcproj index 52f79e0..8e0ba03 100644 --- a/chrome/app/locales/el.vcproj +++ b/chrome/app/locales/el.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_el.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_el.rc" > </File> <File diff --git a/chrome/app/locales/en-GB.vcproj b/chrome/app/locales/en-GB.vcproj index bcc3fc1..944fdb9 100644 --- a/chrome/app/locales/en-GB.vcproj +++ b/chrome/app/locales/en-GB.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_en-GB.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-GB.rc" > </File> <File diff --git a/chrome/app/locales/en-US.vcproj b/chrome/app/locales/en-US.vcproj index 05f9254..ea6c3be 100644 --- a/chrome/app/locales/en-US.vcproj +++ b/chrome/app/locales/en-US.vcproj @@ -150,7 +150,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_en-US.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_en-US.rc" > </File> <File diff --git a/chrome/app/locales/es-419.vcproj b/chrome/app/locales/es-419.vcproj index d61b7ae..b4673e1 100644 --- a/chrome/app/locales/es-419.vcproj +++ b/chrome/app/locales/es-419.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_es-419.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es-419.rc" > </File> <File diff --git a/chrome/app/locales/es.vcproj b/chrome/app/locales/es.vcproj index b95f569..a3b0761 100644 --- a/chrome/app/locales/es.vcproj +++ b/chrome/app/locales/es.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_es.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_es.rc" > </File> <File diff --git a/chrome/app/locales/et.vcproj b/chrome/app/locales/et.vcproj index c8b9280..00806f6 100644 --- a/chrome/app/locales/et.vcproj +++ b/chrome/app/locales/et.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_et.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_et.rc" > </File> <File diff --git a/chrome/app/locales/fi.vcproj b/chrome/app/locales/fi.vcproj index d36135d..7284f68 100644 --- a/chrome/app/locales/fi.vcproj +++ b/chrome/app/locales/fi.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_fi.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fi.rc" > </File> <File diff --git a/chrome/app/locales/fil.vcproj b/chrome/app/locales/fil.vcproj index 7314d3a..1566861 100644 --- a/chrome/app/locales/fil.vcproj +++ b/chrome/app/locales/fil.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_fil.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fil.rc" > </File> <File diff --git a/chrome/app/locales/fr.vcproj b/chrome/app/locales/fr.vcproj index c7fd828..816d4d8 100644 --- a/chrome/app/locales/fr.vcproj +++ b/chrome/app/locales/fr.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_fr.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_fr.rc" > </File> <File diff --git a/chrome/app/locales/gu.vcproj b/chrome/app/locales/gu.vcproj index ded7b5b..0ae14f6 100644 --- a/chrome/app/locales/gu.vcproj +++ b/chrome/app/locales/gu.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_gu.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_gu.rc" > </File> <File diff --git a/chrome/app/locales/he.vcproj b/chrome/app/locales/he.vcproj index 2bc1e32..191adaa 100644 --- a/chrome/app/locales/he.vcproj +++ b/chrome/app/locales/he.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_he.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_he.rc" > </File> <File diff --git a/chrome/app/locales/hi.vcproj b/chrome/app/locales/hi.vcproj index 4e7708e..4fb374b 100644 --- a/chrome/app/locales/hi.vcproj +++ b/chrome/app/locales/hi.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_hi.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hi.rc" > </File> <File diff --git a/chrome/app/locales/hr.vcproj b/chrome/app/locales/hr.vcproj index 785915b..1d7f4d5 100644 --- a/chrome/app/locales/hr.vcproj +++ b/chrome/app/locales/hr.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_hr.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hr.rc" > </File> <File diff --git a/chrome/app/locales/hu.vcproj b/chrome/app/locales/hu.vcproj index 96b37ab..bb1a1a6 100644 --- a/chrome/app/locales/hu.vcproj +++ b/chrome/app/locales/hu.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_hu.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_hu.rc" > </File> <File diff --git a/chrome/app/locales/id.vcproj b/chrome/app/locales/id.vcproj index 0a48c3d..17bc92a 100644 --- a/chrome/app/locales/id.vcproj +++ b/chrome/app/locales/id.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_id.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_id.rc" > </File> <File diff --git a/chrome/app/locales/it.vcproj b/chrome/app/locales/it.vcproj index a1f2fbf..bb8632f 100644 --- a/chrome/app/locales/it.vcproj +++ b/chrome/app/locales/it.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_it.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_it.rc" > </File> <File diff --git a/chrome/app/locales/ja.vcproj b/chrome/app/locales/ja.vcproj index 67f21d6..8b88fc8 100644 --- a/chrome/app/locales/ja.vcproj +++ b/chrome/app/locales/ja.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ja.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ja.rc" > </File> <File diff --git a/chrome/app/locales/kn.vcproj b/chrome/app/locales/kn.vcproj index 3e7bc9a..7179c08 100644 --- a/chrome/app/locales/kn.vcproj +++ b/chrome/app/locales/kn.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_kn.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_kn.rc" > </File> <File diff --git a/chrome/app/locales/ko.vcproj b/chrome/app/locales/ko.vcproj index 0351668..91dc2b0 100644 --- a/chrome/app/locales/ko.vcproj +++ b/chrome/app/locales/ko.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ko.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ko.rc" > </File> <File diff --git a/chrome/app/locales/lt.vcproj b/chrome/app/locales/lt.vcproj index 57381c7..170c078 100644 --- a/chrome/app/locales/lt.vcproj +++ b/chrome/app/locales/lt.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_lt.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lt.rc" > </File> <File diff --git a/chrome/app/locales/lv.vcproj b/chrome/app/locales/lv.vcproj index 305a5c9..3e8aa3a 100644 --- a/chrome/app/locales/lv.vcproj +++ b/chrome/app/locales/lv.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_lv.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_lv.rc" > </File> <File diff --git a/chrome/app/locales/ml.vcproj b/chrome/app/locales/ml.vcproj index e333e67..6b37f02 100644 --- a/chrome/app/locales/ml.vcproj +++ b/chrome/app/locales/ml.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ml.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ml.rc" > </File> <File diff --git a/chrome/app/locales/mr.vcproj b/chrome/app/locales/mr.vcproj index d2b3a32..ba0b230 100644 --- a/chrome/app/locales/mr.vcproj +++ b/chrome/app/locales/mr.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_mr.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_mr.rc" > </File> <File diff --git a/chrome/app/locales/nb.vcproj b/chrome/app/locales/nb.vcproj index e38011a..ddd5d60 100644 --- a/chrome/app/locales/nb.vcproj +++ b/chrome/app/locales/nb.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_nb.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nb.rc" > </File> <File diff --git a/chrome/app/locales/nl.vcproj b/chrome/app/locales/nl.vcproj index d0cb584..5964888 100644 --- a/chrome/app/locales/nl.vcproj +++ b/chrome/app/locales/nl.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_nl.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_nl.rc" > </File> <File diff --git a/chrome/app/locales/or.vcproj b/chrome/app/locales/or.vcproj index e7c3d6e..04779ec 100644 --- a/chrome/app/locales/or.vcproj +++ b/chrome/app/locales/or.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_or.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_or.rc" > </File> <File diff --git a/chrome/app/locales/pl.vcproj b/chrome/app/locales/pl.vcproj index cc0b9ad..186b933 100644 --- a/chrome/app/locales/pl.vcproj +++ b/chrome/app/locales/pl.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_pl.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pl.rc" > </File> <File diff --git a/chrome/app/locales/pt-BR.vcproj b/chrome/app/locales/pt-BR.vcproj index e06cf6b..fa4293c 100644 --- a/chrome/app/locales/pt-BR.vcproj +++ b/chrome/app/locales/pt-BR.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_pt-BR.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-BR.rc" > </File> <File diff --git a/chrome/app/locales/pt-PT.vcproj b/chrome/app/locales/pt-PT.vcproj index e202993..600077e 100644 --- a/chrome/app/locales/pt-PT.vcproj +++ b/chrome/app/locales/pt-PT.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_pt-PT.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_pt-PT.rc" > </File> <File diff --git a/chrome/app/locales/ro.vcproj b/chrome/app/locales/ro.vcproj index f5014c9..e662853 100644 --- a/chrome/app/locales/ro.vcproj +++ b/chrome/app/locales/ro.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ro.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ro.rc" > </File> <File diff --git a/chrome/app/locales/ru.vcproj b/chrome/app/locales/ru.vcproj index 0d53cdd..0acec23 100644 --- a/chrome/app/locales/ru.vcproj +++ b/chrome/app/locales/ru.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ru.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ru.rc" > </File> <File diff --git a/chrome/app/locales/sk.vcproj b/chrome/app/locales/sk.vcproj index c29f7e5..4772679 100644 --- a/chrome/app/locales/sk.vcproj +++ b/chrome/app/locales/sk.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_sk.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sk.rc" > </File> <File diff --git a/chrome/app/locales/sl.vcproj b/chrome/app/locales/sl.vcproj index 3a9aa59..a468384 100644 --- a/chrome/app/locales/sl.vcproj +++ b/chrome/app/locales/sl.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_sl.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sl.rc" > </File> <File diff --git a/chrome/app/locales/sr.vcproj b/chrome/app/locales/sr.vcproj index 57b3a6a..8fa065c 100644 --- a/chrome/app/locales/sr.vcproj +++ b/chrome/app/locales/sr.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_sr.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sr.rc" > </File> <File diff --git a/chrome/app/locales/sv.vcproj b/chrome/app/locales/sv.vcproj index b39ac08..aef7ba0 100644 --- a/chrome/app/locales/sv.vcproj +++ b/chrome/app/locales/sv.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_sv.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_sv.rc" > </File> <File diff --git a/chrome/app/locales/ta.vcproj b/chrome/app/locales/ta.vcproj index bec6fae..7b6360b 100644 --- a/chrome/app/locales/ta.vcproj +++ b/chrome/app/locales/ta.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_ta.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_ta.rc" > </File> <File diff --git a/chrome/app/locales/te.vcproj b/chrome/app/locales/te.vcproj index 22e8a5c..4b29924 100644 --- a/chrome/app/locales/te.vcproj +++ b/chrome/app/locales/te.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_te.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_te.rc" > </File> <File diff --git a/chrome/app/locales/th.vcproj b/chrome/app/locales/th.vcproj index 29ab8e0..3e6cef3 100644 --- a/chrome/app/locales/th.vcproj +++ b/chrome/app/locales/th.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_th.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_th.rc" > </File> <File diff --git a/chrome/app/locales/tr.vcproj b/chrome/app/locales/tr.vcproj index 67fbe68..fe691d9 100644 --- a/chrome/app/locales/tr.vcproj +++ b/chrome/app/locales/tr.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_tr.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_tr.rc" > </File> <File diff --git a/chrome/app/locales/uk.vcproj b/chrome/app/locales/uk.vcproj index 3158855..ecff800 100644 --- a/chrome/app/locales/uk.vcproj +++ b/chrome/app/locales/uk.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_uk.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_uk.rc" > </File> <File diff --git a/chrome/app/locales/vi.vcproj b/chrome/app/locales/vi.vcproj index e9d64a7..1223af8 100644 --- a/chrome/app/locales/vi.vcproj +++ b/chrome/app/locales/vi.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_vi.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_vi.rc" > </File> <File diff --git a/chrome/app/locales/zh-CN.vcproj b/chrome/app/locales/zh-CN.vcproj index e81f8bc..c9c3288 100644 --- a/chrome/app/locales/zh-CN.vcproj +++ b/chrome/app/locales/zh-CN.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_zh-CN.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-CN.rc" > </File> <File diff --git a/chrome/app/locales/zh-TW.vcproj b/chrome/app/locales/zh-TW.vcproj index 5c02bb0..6e3b2fb 100644 --- a/chrome/app/locales/zh-TW.vcproj +++ b/chrome/app/locales/zh-TW.vcproj @@ -148,7 +148,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_strings_zh-TW.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_strings_zh-TW.rc" > </File> <File diff --git a/chrome/chrome.sln b/chrome/chrome.sln index 2d4aa90..cd77cb3 100644 --- a/chrome/chrome.sln +++ b/chrome/chrome.sln @@ -36,22 +36,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcp EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebKit (readonly)", "WebKit (readonly)", "{1088577A-0C49-4DE0-85CD-B68AD0BE55AA}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webcore", "..\webkit\webcore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "..\webkit\build\WebCore\WebCore.vcproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}" ProjectSection(ProjectDependencies) = postProject + {1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32} {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glue", "..\webkit\glue.vcproj", "{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Port", "..\webkit\build\port\port.vcproj", "{5597AD47-3494-4750-A235-4F9C2F864700}" + ProjectSection(ProjectDependencies) = postProject + {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Glue", "..\webkit\glue\glue.vcproj", "{C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09}" ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} - {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} + {1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32} {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "skia", "..\skia\skia.vcproj", "{CD9CA56E-4E94-444C-87D4-58CA1E6F300D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wtf", "..\webkit\wtf.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\webkit\build\JavaScriptCore\WTF.vcproj", "{AA8A5A85-592B-4357-BC60-E0E91E026AF6}" ProjectSection(ProjectDependencies) = postProject {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} EndProjectSection @@ -123,6 +133,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lzma_sdk", "..\third_party\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_strings", "app\chrome_strings.vcproj", "{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Bindings", "..\webkit\build\V8Bindings\V8Bindings.vcproj", "{625A8F11-2B4E-45B4-BD99-C6D629C606C0}" + ProjectSection(ProjectDependencies) = postProject + {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dll.vcproj", "{C0A7EE2C-2A6D-45BE-BA78-6D006FDF52D9}" ProjectSection(ProjectDependencies) = postProject {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} @@ -133,10 +149,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {6AE76406-B03B-11DD-94B1-80B556D89593} = {6AE76406-B03B-11DD-94B1-80B556D89593} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} @@ -166,7 +184,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_dll", "app\chrome_dl EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\third_party\bzip2\bzip2.vcproj", "{2A70CBF0-847E-4E3A-B926-542A656DC7FE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_layout_test_plugin", "..\webkit\tools\test_shell\npapi_layout_test_plugin.vcproj", "{BE6D5659-A8D5-4890-A42C-090DD10EF62C}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_layout_test_plugin", "..\webkit\tools\npapi_layout_test_plugin\npapi_layout_test_plugin.vcproj", "{BE6D5659-A8D5-4890-A42C-090DD10EF62C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "..\webkit\tools\test_shell\test_shell.vcproj", "{FA39524D-3067-4141-888D-28A86C66F2B9}" ProjectSection(ProjectDependencies) = postProject @@ -178,10 +196,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell", "..\webkit\too {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {3E03D462-780D-4C4D-B22E-5E095E6CF110} = {3E03D462-780D-4C4D-B22E-5E095E6CF110} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} - {77C32787-1B96-CB84-B905-7F170629F0AC} = {77C32787-1B96-CB84-B905-7F170629F0AC} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} {8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308} {9E5416B9-B91B-4029-93F4-102C1AD5CAF4} = {9E5416B9-B91B-4029-93F4-102C1AD5CAF4} @@ -226,10 +245,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perf_tests", "test\perf\per {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} @@ -264,10 +285,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_tests", "test\unit\uni {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} @@ -426,6 +449,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_profile", "tools\p {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} @@ -459,10 +483,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "..\webk {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} - {77C32787-1B96-CB84-B905-7F170629F0AC} = {77C32787-1B96-CB84-B905-7F170629F0AC} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} {8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308} {A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551} @@ -479,13 +504,14 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_tests", "..\webk {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} = {FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "config", "..\webkit\config.vcproj", "{2E2D3301-2EC4-4C0F-B889-87073B30F673}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Config", "..\webkit\build\JSConfig\V8Config.vcproj", "{2E2D3301-2EC4-4C0F-B889-87073B30F673}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "stats_viewer", "..\tools\stats_viewer\stats_viewer.csproj", "{41735CD9-3E35-47F7-9FD1-4A9950B6B131}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-US", "app\locales\en-US.vcproj", "{CAE2D1E6-3F19-492F-A35C-68AA7ACAD6D3}" ProjectSection(ProjectDependencies) = postProject {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -496,6 +522,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "locales", "locales", "{2325 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chrome_resources", "app\chrome_resources.vcproj", "{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_strings", "..\webkit\build\webkit_strings\webkit_strings.vcproj", "{60B43839-95E6-4526-A661-209F16335E0E}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "theme_dll", "app\theme\theme_dll.vcproj", "{FD683DD6-D9BF-4B1B-AB6D-A3AC03EDAA4D}" ProjectSection(ProjectDependencies) = postProject {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} @@ -505,7 +533,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "security_tests", "test\secu EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "googleurl", "..\build\temp_gyp\googleurl.vcproj", "{EF5E94AB-B646-4E5B-A058-52EF07B8351C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_test_plugin", "..\webkit\tools\test_shell\npapi_test_plugin.vcproj", "{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "npapi_test_plugin", "..\webkit\glue\plugins\test\npapi_test_plugin.vcproj", "{0D04AEC1-6B68-492C-BCCF-808DFD69ABC6}" ProjectSection(ProjectDependencies) = postProject {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} {8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308} @@ -638,10 +666,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "interactive_ui_tests", "tes {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} @@ -770,23 +800,26 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "installer_unittests", "inst EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "da", "app\locales\da.vcproj", "{A493331B-3180-49FE-8D0E-D121645E63AD}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "activex_test_control", "test\activex_test_control\activex_test_control.vcproj", "{414D4D24-5D65-498B-A33F-3A29AD3CDEDC}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "default_plugin", "..\webkit\default_plugin\default_plugin.vcproj", "{5916D37D-8C97-424F-A904-74E52594C2D6}" + ProjectSection(ProjectDependencies) = postProject + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-TW", "app\locales\zh-TW.vcproj", "{E7B11CF0-FE40-4A69-AE20-1B882F4D7585}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "he", "app\locales\he.vcproj", "{A28310B8-7BD0-4CDF-A7D8-59CAB42AA1C4}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -826,12 +859,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mini_installer_test", "test {EFBB1436-A63F-4CD8-9E99-B89226E782EC} = {EFBB1436-A63F-4CD8-9E99-B89226E782EC} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pcre", "..\webkit\pcre.vcproj", "{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore_pcre", "..\webkit\build\JavaScriptCore\JavaScriptCore_pcre.vcproj", "{49909552-0B0C-4C14-8CF6-DB8A2ADE0934}" ProjectSection(ProjectDependencies) = postProject {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} {AA8A5A85-592B-4357-BC60-E0E91E026AF6} = {AA8A5A85-592B-4357-BC60-E0E91E026AF6} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V8Bindings_prebuild", "..\webkit\build\V8Bindings\V8Bindings_prebuild.vcproj", "{2F7EDFA2-EE27-4D83-8454-9EFBD5779203}" + ProjectSection(ProjectDependencies) = postProject + {21E22961-22BF-4493-BD3A-868F93DA5179} = {21E22961-22BF-4493-BD3A-868F93DA5179} + {EC8B7909-62AF-470D-A75D-E1D89C837142} = {EC8B7909-62AF-470D-A75D-E1D89C837142} + EndProjectSection +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "..\gears\gears.vcproj", "{D703D7A0-EDC1-4FE6-9E22-56154155B24E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ondemand_updates", "..\google_update\ondemand_updates.vcproj", "{4052059A-D72B-4183-B5C2-9D1B099E9E35}" @@ -893,223 +932,223 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "terms", "terms", "{D13F055D EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ar", "app\locales\ar.vcproj", "{3AB90E6A-56FF-4C9D-B918-AB76DDBF8BE8}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bg", "app\locales\bg.vcproj", "{5BDB7EE1-A1FD-410C-9598-21519A1B7952}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ca", "app\locales\ca.vcproj", "{F7790A54-4078-4E4A-8231-818BE9FB1F94}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cs", "app\locales\cs.vcproj", "{7EA8C4AB-F9C6-4FA1-8B0A-74F5650430B2}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "de", "app\locales\de.vcproj", "{BA62FF5E-08A6-4102-9675-C12E8C9D4CC0}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "el", "app\locales\el.vcproj", "{D314F1B3-9299-4866-8362-08BF811B0FA3}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "en-GB", "app\locales\en-GB.vcproj", "{34231B28-C51C-4C1C-AF07-C763668B1404}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es", "app\locales\es.vcproj", "{5AEA4BF6-27CD-47FC-9370-D87771CFA196}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "et", "app\locales\et.vcproj", "{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fi", "app\locales\fi.vcproj", "{64D81334-DE73-457D-8FC1-9492508A2663}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fil", "app\locales\fil.vcproj", "{3A932C39-AFA9-4BDC-B775-F71A426D04BF}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fr", "app\locales\fr.vcproj", "{0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hi", "app\locales\hi.vcproj", "{228DD844-9926-420E-B193-6973BF2A4D0B}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hr", "app\locales\hr.vcproj", "{CE1426F6-7D2B-4574-9929-58387BF7B05F}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hu", "app\locales\hu.vcproj", "{AFF332BF-AF3D-4D35-86FC-42A727F01D36}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "id", "app\locales\id.vcproj", "{E3DF045F-2174-4685-9CF7-0630A79F324B}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "it", "app\locales\it.vcproj", "{275F2993-EE9B-4E00-9C85-10A182FD423A}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ja", "app\locales\ja.vcproj", "{B2D715CE-4CBB-415A-A032-E700C90ADF91}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ko", "app\locales\ko.vcproj", "{32167995-4014-4E4C-983B-F7E17C24EB25}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lt", "app\locales\lt.vcproj", "{80E37CB5-059D-4F4B-AEF6-08265468D368}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lv", "app\locales\lv.vcproj", "{A5C5D801-4026-49F2-BBF1-250941855306}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nl", "app\locales\nl.vcproj", "{63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nb", "app\locales\nb.vcproj", "{B30B0E1F-1CE9-4DEF-A752-7498FD709C1F}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pl", "app\locales\pl.vcproj", "{9F53807E-9382-47BD-8371-E5D04F517E9C}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-BR", "app\locales\pt-BR.vcproj", "{2F914112-2657-49EC-8EA6-3BA63340DE27}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pt-PT", "app\locales\pt-PT.vcproj", "{0A13F602-B497-4BC1-ABD8-03CA8E95B2AF}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ro", "app\locales\ro.vcproj", "{C70D3509-57C4-4326-90C1-2EC0AE34848D}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ru", "app\locales\ru.vcproj", "{7D456640-3619-4D23-A56D-E0084400CCBF}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sk", "app\locales\sk.vcproj", "{82F5BFE5-FDCE-47D4-8B38-BEEBED561681}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl", "app\locales\sl.vcproj", "{C2A444C2-9D74-4AD7-AE7C-04F5EDA17060}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sr", "app\locales\sr.vcproj", "{300C6A09-663E-48B6-8E07-A0D50CAF8F25}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "th", "app\locales\th.vcproj", "{226B3533-1FF3-42F6-A8E3-C4DDBC955290}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sv", "app\locales\sv.vcproj", "{B0D5BD91-6153-4CA6-BC2F-4E3BD43E5DB7}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tr", "app\locales\tr.vcproj", "{65C78BBB-8FCB-48E4-94C8-1F0F981929AF}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "uk", "app\locales\uk.vcproj", "{182D578D-2DAC-4BB7-AFEC-9A2855E56F94}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vi", "app\locales\vi.vcproj", "{DA5C6FCB-FCFD-49B8-8DDA-8351638096DB}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zh-CN", "app\locales\zh-CN.vcproj", "{C0C7DA58-C90D-4BDE-AE44-588997339F5D}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -1135,7 +1174,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "rlz", "..\rlz\rlz.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "es-419", "app\locales\es-419.vcproj", "{FA660037-EB40-4A43-AA9D-9653C57F2789}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -1225,49 +1264,49 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sdch", "..\sdch\sdch.vcproj EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "kn", "app\locales\kn.vcproj", "{3E6B24F6-9FA9-4066-859E-BF747FA3080A}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bn", "app\locales\bn.vcproj", "{4B60E8B8-416F-40B2-8A54-F75970A21992}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gu", "app\locales\gu.vcproj", "{256DECCE-9886-4C21-96A5-EE47DF5E07E9}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ml", "app\locales\ml.vcproj", "{CAB69303-0F02-4C68-A12E-FFE55DB52526}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr", "app\locales\mr.vcproj", "{A464166F-8507-49B4-9B02-5CB77C498B25}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "or", "app\locales\or.vcproj", "{E07D267C-34C3-4DDB-8B41-94697808714A}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ta", "app\locales\ta.vcproj", "{7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "te", "app\locales\te.vcproj", "{9D13D9B8-6C28-42A7-935C-B769EBC55BAA}" ProjectSection(ProjectDependencies) = postProject - {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {0B469837-3D46-484A-AFB3-C5A6C68730B9} + {60B43839-95E6-4526-A661-209F16335E0E} = {60B43839-95E6-4526-A661-209F16335E0E} {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} EndProjectSection EndProject @@ -1289,7 +1328,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gcapi_test", "installer\gca EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "net_resources", "..\net\net_resources.vcproj", "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "..\webkit\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit_resources", "..\webkit\build\webkit_resources\webkit_resources.vcproj", "{0B469837-3D46-484A-AFB3-C5A6C68730B9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore_prebuild", "..\webkit\build\WebCore\WebCore_prebuild.vcproj", "{1444235E-0E97-4C80-A73E-EE73F3706C32}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crash_cache", "..\net\crash_cache.vcproj", "{B0EE0599-2913-46A0-A847-A3EC813658D3}" ProjectSection(ProjectDependencies) = postProject @@ -1318,9 +1359,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "printing_unittests", "..\pr {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webkit", "..\webkit\webkit.vcproj", "{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "..\webkit\build\WebKit\WebKit.vcproj", "{5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}" ProjectSection(ProjectDependencies) = postProject + {1444235E-0E97-4C80-A73E-EE73F3706C32} = {1444235E-0E97-4C80-A73E-EE73F3706C32} {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {2E2D3301-2EC4-4C0F-B889-87073B30F673} + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "worker", "worker\worker.vcproj", "{C78D02D0-A366-4EC6-A248-AA8E64C4BA18}" @@ -1362,7 +1405,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "url_fetch_test", "test\url_ {FA537565-7B03-4FFC-AF15-F7A979B72E22} = {FA537565-7B03-4FFC-AF15-F7A979B72E22} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "..\webkit\tools\test_shell\test_worker.vcproj", "{3E03D462-780D-4C4D-B22E-5E095E6CF110}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "..\webkit\tools\test_shell\test_worker\test_worker.vcproj", "{3E03D462-780D-4C4D-B22E-5E095E6CF110}" ProjectSection(ProjectDependencies) = postProject {1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165} {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} = {1C16337B-ACF3-4D03-AA90-851C5B5EADA6} @@ -1372,6 +1415,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_worker", "..\webkit\to {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} = {8423AF0D-4B88-4EBF-94E1-E4D00D00E21C} {A508ADD3-CECE-4E0F-8448-2F5E454DF551} = {A508ADD3-CECE-4E0F-8448-2F5E454DF551} @@ -1403,10 +1447,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_tests_dll", "test\b {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {2A70CBF0-847E-4E3A-B926-542A656DC7FE} {326E9795-E760-410A-B69A-3F79DB3F5243} = {326E9795-E760-410A-B69A-3F79DB3F5243} {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} = {49909552-0B0C-4C14-8CF6-DB8A2ADE0934} + {5597AD47-3494-4750-A235-4F9C2F864700} = {5597AD47-3494-4750-A235-4F9C2F864700} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {57823D8C-A317-4713-9125-2C91FDFD12D6} {5916D37D-8C97-424F-A904-74E52594C2D6} = {5916D37D-8C97-424F-A904-74E52594C2D6} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {625A8F11-2B4E-45B4-BD99-C6D629C606C0} {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} = {6EAD4A4B-2BBC-4974-8E45-BB5C16CC2AC9} {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {6F9258E5-294F-47B2-919D-17FFE7A8B751} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {7100F41F-868D-4E99-80A2-AF8E6574749D} @@ -1445,8 +1491,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "browser_tests_launcher", "t EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tcmalloc", "..\third_party\tcmalloc\tcmalloc.vcproj", "{C564F145-9172-42C3-BFCB-60FDEA124321}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_shell_common", "..\webkit\tools\test_shell\test_shell_common.vcproj", "{77C32787-1B96-CB84-B905-7F170629F0AC}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Mixed Platforms = Debug|Mixed Platforms @@ -1511,6 +1555,14 @@ Global {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Mixed Platforms.Build.0 = Release|Win32 {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.ActiveCfg = Release|Win32 {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495}.Release|Win32.Build.0 = Release|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Win32.ActiveCfg = Debug|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Debug|Win32.Build.0 = Debug|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Mixed Platforms.Build.0 = Release|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Win32.ActiveCfg = Release|Win32 + {1444235E-0E97-4C80-A73E-EE73F3706C32}.Release|Win32.Build.0 = Release|Win32 {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {1556EF78-C7E6-43C8-951F-F6B43AC0DD12}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -1650,6 +1702,14 @@ Global {2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Mixed Platforms.Build.0 = Release|Win32 {2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Win32.ActiveCfg = Release|Win32 {2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357}.Release|Win32.Build.0 = Release|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.ActiveCfg = Debug|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Debug|Win32.Build.0 = Debug|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.ActiveCfg = Release|Win32 + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203}.Release|Win32.Build.0 = Release|Win32 {2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {2F914112-2657-49EC-8EA6-3BA63340DE27}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -1807,6 +1867,14 @@ Global {50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Mixed Platforms.Build.0 = Release|Win32 {50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.ActiveCfg = Release|Win32 {50B079C7-CD01-42D3-B8C4-9F8D9322E822}.Release|Win32.Build.0 = Release|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.ActiveCfg = Debug|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Debug|Win32.Build.0 = Debug|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Release|Mixed Platforms.Build.0 = Release|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.ActiveCfg = Release|Win32 + {5597AD47-3494-4750-A235-4F9C2F864700}.Release|Win32.Build.0 = Release|Win32 {57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {57823D8C-A317-4713-9125-2C91FDFD12D6}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -1855,6 +1923,22 @@ Global {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Mixed Platforms.Build.0 = Release|Win32 {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Win32.ActiveCfg = Release|Win32 {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65}.Release|Win32.Build.0 = Release|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.ActiveCfg = Debug|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Debug|Win32.Build.0 = Debug|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Release|Mixed Platforms.Build.0 = Release|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.ActiveCfg = Release|Win32 + {60B43839-95E6-4526-A661-209F16335E0E}.Release|Win32.Build.0 = Release|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Mixed Platforms.Build.0 = Debug|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.ActiveCfg = Debug|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Debug|Win32.Build.0 = Debug|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.ActiveCfg = Release|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Mixed Platforms.Build.0 = Release|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.ActiveCfg = Release|Win32 + {625A8F11-2B4E-45B4-BD99-C6D629C606C0}.Release|Win32.Build.0 = Release|Win32 {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -1919,14 +2003,6 @@ Global {76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Mixed Platforms.Build.0 = Release|Win32 {76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.ActiveCfg = Release|Win32 {76235B67-1C27-4627-8A33-4B2E1EF93EDE}.Release|Win32.Build.0 = Release|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Debug|Win32.ActiveCfg = Debug|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Debug|Win32.Build.0 = Debug|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Release|Mixed Platforms.Build.0 = Release|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Release|Win32.ActiveCfg = Release|Win32 - {77C32787-1B96-CB84-B905-7F170629F0AC}.Release|Win32.Build.0 = Release|Win32 {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Mixed Platforms.Build.0 = Debug|Win32 {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -2772,6 +2848,7 @@ Global {0B469837-3D46-484A-AFB3-C5A6C68730B9} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} {0D04AEC1-6B68-492C-BCCF-808DFD69ABC6} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {0D54A5C4-B78B-41A2-BF8A-5DA48AC90495} = {2325D8C4-8EF5-42AC-8900-492225750DE4} + {1444235E-0E97-4C80-A73E-EE73F3706C32} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA} {1556EF78-C7E6-43C8-951F-F6B43AC0DD12} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {182D578D-2DAC-4BB7-AFEC-9A2855E56F94} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {1832A374-8A74-4F9E-B536-69A699B3E165} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} @@ -2792,6 +2869,7 @@ Global {2A70CBF0-847E-4E3A-B926-542A656DC7FE} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {2E2D3301-2EC4-4C0F-B889-87073B30F673} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA} {2E969AE9-7B12-4EDB-8E8B-48C7AE7BE357} = {846901FD-A619-4BD5-A303-38174730CDD6} + {2F7EDFA2-EE27-4D83-8454-9EFBD5779203} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} {2F914112-2657-49EC-8EA6-3BA63340DE27} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {300C6A09-663E-48B6-8E07-A0D50CAF8F25} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {32167995-4014-4E4C-983B-F7E17C24EB25} = {2325D8C4-8EF5-42AC-8900-492225750DE4} @@ -2811,12 +2889,15 @@ Global {4B60E8B8-416F-40B2-8A54-F75970A21992} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {4B6E199A-034A-49BD-AB93-458DD37E45B1} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {50B079C7-CD01-42D3-B8C4-9F8D9322E822} = {1174D37F-6ABB-45DA-81B3-C631281273B7} + {5597AD47-3494-4750-A235-4F9C2F864700} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} {57823D8C-A317-4713-9125-2C91FDFD12D6} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} {5916D37D-8C97-424F-A904-74E52594C2D6} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} {5AEA4BF6-27CD-47FC-9370-D87771CFA196} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {5BDB7EE1-A1FD-410C-9598-21519A1B7952} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} {5ECEC9E5-8F23-47B6-93E0-C3B328B3BE65} = {1088577A-0C49-4DE0-85CD-B68AD0BE55AA} + {60B43839-95E6-4526-A661-209F16335E0E} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} + {625A8F11-2B4E-45B4-BD99-C6D629C606C0} = {CB43561E-A6F8-49E2-96A2-3F2BA1FFF21E} {63011A7B-CE4D-4DF1-B5DA-1B133C14A2E8} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {64D81334-DE73-457D-8FC1-9492508A2663} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {65C78BBB-8FCB-48E4-94C8-1F0F981929AF} = {2325D8C4-8EF5-42AC-8900-492225750DE4} @@ -2825,7 +2906,6 @@ Global {6F9258E5-294F-47B2-919D-17FFE7A8B751} = {97555540-8163-4D0F-BCAC-EFA0FFED3453} {7100F41F-868D-4E99-80A2-AF8E6574749D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA} {76235B67-1C27-4627-8A33-4B2E1EF93EDE} = {1174D37F-6ABB-45DA-81B3-C631281273B7} - {77C32787-1B96-CB84-B905-7F170629F0AC} = {1174D37F-6ABB-45DA-81B3-C631281273B7} {7A0BA0C5-0D90-49AE-919A-4BE096F69E4F} = {2325D8C4-8EF5-42AC-8900-492225750DE4} {7B219FAA-E360-43C8-B341-804A94EEFFAC} = {B6867423-23BD-4588-9321-2D500F128A3D} {7D1EC571-687B-5D48-E259-C5BA78E717D0} = {846901FD-A619-4BD5-A303-38174730CDD6} diff --git a/chrome/test/browser/browser_tests_dll.vcproj b/chrome/test/browser/browser_tests_dll.vcproj index b531402..8c1658f 100644 --- a/chrome/test/browser/browser_tests_dll.vcproj +++ b/chrome/test/browser/browser_tests_dll.vcproj @@ -278,7 +278,7 @@ >
</File>
<File
- RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc"
+ RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc"
>
</File>
<File
diff --git a/chrome/test/interactive_ui/interactive_ui.vcproj b/chrome/test/interactive_ui/interactive_ui.vcproj index 577ad79..ade66f2 100644 --- a/chrome/test/interactive_ui/interactive_ui.vcproj +++ b/chrome/test/interactive_ui/interactive_ui.vcproj @@ -156,18 +156,6 @@ Name="Common" > <File - RelativePath="..\chrome_process_util.cc" - > - </File> - <File - RelativePath="..\chrome_process_util.h" - > - </File> - <File - RelativePath="..\chrome_process_util_win.cc" - > - </File> - <File RelativePath="..\in_process_browser_test.cc" > </File> @@ -204,6 +192,18 @@ > </File> <File + RelativePath="..\chrome_process_util.cc" + > + </File> + <File + RelativePath="..\chrome_process_util.h" + > + </File> + <File + RelativePath="..\chrome_process_util_win.cc" + > + </File> + <File RelativePath="..\testing_profile.cc" > </File> @@ -308,7 +308,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc" > </File> <File diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index a608a0a..0dc8102 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -368,7 +368,7 @@ > </File> <File - RelativePath="$(OutDir)\obj\global_intermediate\webkit\webkit_resources.rc" + RelativePath="$(OutDir)\grit_derived_sources\webkit_resources.rc" > </File> <File @@ -564,6 +564,10 @@ > </File> <File + RelativePath="..\..\browser\autocomplete\search_provider_unittest.cc" + > + </File> + <File RelativePath="..\..\browser\login_prompt_unittest.cc" > </File> @@ -676,10 +680,6 @@ > </File> <File - RelativePath="..\..\browser\autocomplete\search_provider_unittest.cc" - > - </File> - <File RelativePath="..\..\browser\sessions\session_backend_unittest.cc" > </File> @@ -847,19 +847,19 @@ > </File> <File - RelativePath="..\..\browser\renderer_host\test_render_view_host.cc" + RelativePath="..\..\browser\net\test_url_fetcher_factory.cc" > </File> <File - RelativePath="..\..\browser\renderer_host\test_render_view_host.h" + RelativePath="..\..\browser\net\test_url_fetcher_factory.h" > </File> <File - RelativePath="..\..\browser\net\test_url_fetcher_factory.cc" + RelativePath="..\..\browser\renderer_host\test_render_view_host.cc" > </File> <File - RelativePath="..\..\browser\net\test_url_fetcher_factory.h" + RelativePath="..\..\browser\renderer_host\test_render_view_host.h" > </File> <File |