diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_popup_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/resources/about_credits.html | 8 | ||||
| -rw-r--r-- | chrome/browser/spellcheck_worditerator.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc | 2 | ||||
| -rw-r--r-- | chrome/chrome.gyp | 44 | ||||
| -rw-r--r-- | chrome/common/common.vsprops | 2 | ||||
| -rw-r--r-- | chrome/installer/installer.gyp | 4 | ||||
| -rwxr-xr-x | chrome/installer/mini_installer.gyp | 2 | ||||
| -rw-r--r-- | chrome/installer/mini_installer/chrome.release | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/FILES | 2 | ||||
| -rw-r--r-- | chrome/tools/build/win/server.rules | 2 |
11 files changed, 41 insertions, 41 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_popup_model.cc b/chrome/browser/autocomplete/autocomplete_popup_model.cc index 57d101ae..bce6ce9 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_model.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_model.cc @@ -11,7 +11,7 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/notification_service.h" -#include "third_party/icu38/public/common/unicode/ubidi.h" +#include "third_party/icu/public/common/unicode/ubidi.h" /////////////////////////////////////////////////////////////////////////////// // AutocompletePopupModel diff --git a/chrome/browser/resources/about_credits.html b/chrome/browser/resources/about_credits.html index bd61783..346edc9 100644 --- a/chrome/browser/resources/about_credits.html +++ b/chrome/browser/resources/about_credits.html @@ -306,15 +306,15 @@ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION, AND MODIFICATION</strong> </div> </div> -<!-- ICU38 ---> +<!-- ICU ---> <div class="product"> -<span class="title">icu38</span> +<span class="title">ICU</span> <a class="show" href="#" onclick="return toggle(this);">show license</a> <span class="homepage"><a href="http://www.icu-project.org">homepage</a></span> <div class="licence"> -<h3>icu38 is licensed as follows:</h3> +<h3>third_party/icu is licensed as follows:</h3> <p>COPYRIGHT AND PERMISSION NOTICE</p> -<p>Copyright (c) 1995-2008 International Business Machines Corporation and others</p> +<p>Copyright (c) 1995-2009 International Business Machines Corporation and others</p> <p>All rights reserved.</p> <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, provided that the above copyright notice(s) and this permission notice appear in all copies of the Software and that both the above copyright notice(s) and this permission notice appear in supporting documentation.</p> <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p> diff --git a/chrome/browser/spellcheck_worditerator.cc b/chrome/browser/spellcheck_worditerator.cc index dde4752..87343e5 100644 --- a/chrome/browser/spellcheck_worditerator.cc +++ b/chrome/browser/spellcheck_worditerator.cc @@ -11,12 +11,12 @@ #include "base/string_util.h" #include "chrome/browser/spellchecker.h" -#include "third_party/icu38/public/common/unicode/normlzr.h" -#include "third_party/icu38/public/common/unicode/schriter.h" -#include "third_party/icu38/public/common/unicode/uchar.h" -#include "third_party/icu38/public/common/unicode/uscript.h" -#include "third_party/icu38/public/common/unicode/uset.h" -#include "third_party/icu38/public/i18n/unicode/ulocdata.h" +#include "third_party/icu/public/common/unicode/normlzr.h" +#include "third_party/icu/public/common/unicode/schriter.h" +#include "third_party/icu/public/common/unicode/uchar.h" +#include "third_party/icu/public/common/unicode/uscript.h" +#include "third_party/icu/public/common/unicode/uset.h" +#include "third_party/icu/public/i18n/unicode/ulocdata.h" SpellcheckCharAttribute::SpellcheckCharAttribute() { InitializeScriptTable(); diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index f38a53e..c18a97f 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -17,7 +17,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkShader.h" -#include "third_party/icu38/public/common/unicode/ubidi.h" +#include "third_party/icu/public/common/unicode/ubidi.h" #include "views/widget/widget.h" #if defined(OS_WIN) diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 3f67e10..57b4551 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -406,8 +406,8 @@ '../ipc/ipc.gyp:ipc', '../net/net.gyp:net', '../skia/skia.gyp:skia', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/sqlite/sqlite.gyp:sqlite', '../third_party/zlib/zlib.gyp:zlib', @@ -671,8 +671,8 @@ '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', '../third_party/bzip2/bzip2.gyp:bzip2', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', @@ -2674,8 +2674,8 @@ 'chrome_strings', 'theme_resources', '../skia/skia.gyp:skia', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', ], 'include_dirs': [ '..', @@ -2722,8 +2722,8 @@ 'chrome_strings', '../media/media.gyp:media', '../skia/skia.gyp:skia', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', '../third_party/hunspell/hunspell.gyp:hunspell', @@ -2781,8 +2781,8 @@ 'chrome_strings', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/npapi/npapi.gyp:npapi', '../webkit/webkit.gyp:glue', '../webkit/webkit.gyp:webkit', @@ -3744,8 +3744,8 @@ '../build/temp_gyp/googleurl.gyp:googleurl', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', ], 'include_dirs': [ @@ -3898,8 +3898,8 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/bzip2/bzip2.gyp:bzip2', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', ], @@ -5179,7 +5179,7 @@ '../third_party/hunspell/hunspell.gyp:hunspell', '../net/net.gyp:net_resources', '../skia/skia.gyp:skia', - '../third_party/icu38/icu38.gyp:icui18n', + '../third_party/icu/icu.gyp:icui18n', '../third_party/libpng/libpng.gyp:libpng', '../third_party/libxml/libxml.gyp:libxml', '../third_party/zlib/zlib.gyp:zlib', @@ -5309,8 +5309,8 @@ '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', ], 'include_dirs': [ '..', @@ -5381,7 +5381,7 @@ '../third_party/bzip2/bzip2.gyp:*', '../third_party/cld/cld.gyp:cld', '../third_party/codesighs/codesighs.gyp:*', - '../third_party/icu38/icu38.gyp:*', + '../third_party/icu/icu.gyp:*', '../third_party/libjpeg/libjpeg.gyp:*', '../third_party/libpng/libpng.gyp:*', '../third_party/libxml/libxml.gyp:*', @@ -5511,8 +5511,8 @@ '../webkit/webkit.gyp:webkit', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', '../third_party/libxml/libxml.gyp:libxml', '../third_party/npapi/npapi.gyp:npapi', ], @@ -5594,8 +5594,8 @@ '../base/base.gyp:test_support_base', '../skia/skia.gyp:skia', '../testing/gtest.gyp:gtest', - '../third_party/icu38/icu38.gyp:icui18n', - '../third_party/icu38/icu38.gyp:icuuc', + '../third_party/icu/icu.gyp:icui18n', + '../third_party/icu/icu.gyp:icuuc', ], 'include_dirs': [ '..', diff --git a/chrome/common/common.vsprops b/chrome/common/common.vsprops index 05a4809..a834391 100644 --- a/chrome/common/common.vsprops +++ b/chrome/common/common.vsprops @@ -3,6 +3,6 @@ ProjectType="Visual C++" Version="8.00" Name="common (chrome)" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)\common\extra_defines.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\icu\build\using_icu.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\tools\grit\build\using_generated_resources.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)..\chrome\third_party\wtl\using_wtl.vsprops;$(SolutionDir)\common\extra_defines.vsprops" > </VisualStudioPropertySheet> diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp index 3c6e1f7..2997b2d 100644 --- a/chrome/installer/installer.gyp +++ b/chrome/installer/installer.gyp @@ -23,8 +23,8 @@ '../chrome.gyp:chrome_strings', '../../courgette/courgette.gyp:courgette_lib', '../../third_party/bspatch/bspatch.gyp:bspatch', - '../../third_party/icu38/icu38.gyp:icui18n', - '../../third_party/icu38/icu38.gyp:icuuc', + '../../third_party/icu/icu.gyp:icui18n', + '../../third_party/icu/icu.gyp:icuuc', '../../third_party/libxml/libxml.gyp:libxml', '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk', ], diff --git a/chrome/installer/mini_installer.gyp b/chrome/installer/mini_installer.gyp index 229c994..4389884 100755 --- a/chrome/installer/mini_installer.gyp +++ b/chrome/installer/mini_installer.gyp @@ -157,7 +157,7 @@ '<(PRODUCT_DIR)/chrome.exe', '<(PRODUCT_DIR)/chrome.dll', '<(PRODUCT_DIR)/locales/en-US.dll', - '<(PRODUCT_DIR)/icudt38.dll', + '<(PRODUCT_DIR)/icudt42.dll', ], 'outputs': [ 'xxx.out', diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release index cb675d7..20705f1 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -32,7 +32,7 @@ chrome.exe: %(ChromeDir)s\ wow_helper.exe: %(ChromeDir)s\ Dictionaries\en-US.bdic: %(ChromeDir)s\Dictionaries chrome.dll: %(VersionDir)s\ -icudt38.dll: %(VersionDir)s\ +icudt42.dll: %(VersionDir)s\ gears.dll: %(VersionDir)s\ Themes\default.dll: %(VersionDir)s\Themes locales\*.dll: %(VersionDir)s\Locales diff --git a/chrome/tools/build/win/FILES b/chrome/tools/build/win/FILES index 8218bb8..faa9cd2 100644 --- a/chrome/tools/build/win/FILES +++ b/chrome/tools/build/win/FILES @@ -6,7 +6,7 @@ chrome.dll crash_service.exe First Run gears.dll -icudt38.dll +icudt42.dll locales/ar.dll locales/bg.dll locales/bn.dll diff --git a/chrome/tools/build/win/server.rules b/chrome/tools/build/win/server.rules index b9ba301..6a1d870 100644 --- a/chrome/tools/build/win/server.rules +++ b/chrome/tools/build/win/server.rules @@ -9,7 +9,7 @@ DisplayName="Scan Server DLLs"
CommandLine="$(SolutionDir)..\third_party\python_24\python.exe $(SolutionDir)tools\build\win\scan_server_dlls.py --output_dir="$(OutDir)" --input_file="$(InputPath)" --header_output_dir="$(IntDir)" --distribution=$(CHROMIUM_BUILD)"
Outputs="$(OutDir)/registered_dlls.h;"
- AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt38.dll"
+ AdditionalDependencies="$(SolutionDir)\tools\build\win\scan_server_dlls.py;$(OutDir)\chrome.exe;$(OutDir)\crash_reporter.exe;$(OutDir)\chrome.dll;$(OutDir)\locales\en-US.dll;$(OutDir)\icudt42.dll"
FileExtensions="*.release"
ExecutionDescription="Scanning for COM Server DLLs..."
ShowOnlyRuleProperties="false"
|