diff options
| author | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 19:00:51 +0000 |
|---|---|---|
| committer | jcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-07 19:00:51 +0000 |
| commit | a5a4a0b702c644c37398a3c1fbd6be568e81fc2a (patch) | |
| tree | a3498fe847e9944194051ca498d46c4acc216e4a /chrome | |
| parent | 9be4f02cac155a7f0a6f4ff56f4ee3ca9d215dbe (diff) | |
| download | chromium_src-a5a4a0b702c644c37398a3c1fbd6be568e81fc2a.zip chromium_src-a5a4a0b702c644c37398a3c1fbd6be568e81fc2a.tar.gz chromium_src-a5a4a0b702c644c37398a3c1fbd6be568e81fc2a.tar.bz2 | |
Merging a newer version of the CLD code.
Also removed the dependency with Chrome base and fixed the include path so that files don't need to reference third_paty/cld/...
BUG=None
TEST=Make sure unit-tests still pass.
Review URL: http://codereview.chromium.org/519071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/renderer_host/render_view_host.cc | 2 | ||||
| -rwxr-xr-x | chrome/chrome_browser.gypi | 1 | ||||
| -rwxr-xr-x | chrome/chrome_tests.gypi | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/renderer_host/render_view_host.cc b/chrome/browser/renderer_host/render_view_host.cc index d67fda3..1363afd 100644 --- a/chrome/browser/renderer_host/render_view_host.cc +++ b/chrome/browser/renderer_host/render_view_host.cc @@ -1153,7 +1153,7 @@ void RenderViewHost::OnDeterminePageTextReply( int num_languages = 0; bool is_reliable = false; const char* language_iso_code = LanguageCodeISO639_1( - DetectLanguageOfUnicodeText(page_text.c_str(), true, &is_reliable, + DetectLanguageOfUnicodeText(NULL, page_text.c_str(), true, &is_reliable, &num_languages, NULL)); std::string language(language_iso_code); NotificationService::current()->Notify( diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index d072aba..371425e 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2067,6 +2067,7 @@ ], 'include_dirs': [ 'third_party/wtl/include', + '../third_party/cld', ], 'dependencies': [ '../gears/gears.gyp:gears', diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index fa2bc4f..7eb8acbd 100755 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -501,6 +501,7 @@ ], 'include_dirs': [ '..', + '../third_party/cld', ], 'defines': [ 'CLD_WINDOWS', |