Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(444)

Side by Side Diff: chrome/browser/translate/chrome_translate_client.cc

Issue 2396783002: Add LanguageModel, a keyed service that collects language info from CLD. (Closed)
Patch Set: Fixing incognito Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/translate/chrome_translate_client.h" 5 #include "chrome/browser/translate/chrome_translate_client.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/string_split.h" 11 #include "base/strings/string_split.h"
12 #include "build/build_config.h" 12 #include "build/build_config.h"
13 #include "chrome/browser/browser_process.h" 13 #include "chrome/browser/browser_process.h"
14 #include "chrome/browser/chrome_notification_types.h" 14 #include "chrome/browser/chrome_notification_types.h"
15 #include "chrome/browser/infobars/infobar_service.h" 15 #include "chrome/browser/infobars/infobar_service.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/translate/language_model_factory.h"
17 #include "chrome/browser/translate/translate_accept_languages_factory.h" 18 #include "chrome/browser/translate/translate_accept_languages_factory.h"
18 #include "chrome/browser/translate/translate_service.h" 19 #include "chrome/browser/translate/translate_service.h"
19 #include "chrome/browser/ui/browser.h" 20 #include "chrome/browser/ui/browser.h"
20 #include "chrome/browser/ui/browser_finder.h" 21 #include "chrome/browser/ui/browser_finder.h"
21 #include "chrome/browser/ui/browser_tabstrip.h" 22 #include "chrome/browser/ui/browser_tabstrip.h"
22 #include "chrome/browser/ui/browser_window.h" 23 #include "chrome/browser/ui/browser_window.h"
23 #include "chrome/browser/ui/tabs/tab_strip_model.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model.h"
24 #include "chrome/browser/ui/translate/translate_bubble_factory.h" 25 #include "chrome/browser/ui/translate/translate_bubble_factory.h"
25 #include "chrome/common/chrome_paths.h" 26 #include "chrome/common/chrome_paths.h"
26 #include "chrome/common/pref_names.h" 27 #include "chrome/common/pref_names.h"
27 #include "chrome/grit/theme_resources.h" 28 #include "chrome/grit/theme_resources.h"
28 #include "components/prefs/pref_service.h" 29 #include "components/prefs/pref_service.h"
30 #include "components/translate/core/browser/language_model.h"
29 #include "components/translate/core/browser/language_state.h" 31 #include "components/translate/core/browser/language_state.h"
30 #include "components/translate/core/browser/page_translated_details.h" 32 #include "components/translate/core/browser/page_translated_details.h"
31 #include "components/translate/core/browser/translate_accept_languages.h" 33 #include "components/translate/core/browser/translate_accept_languages.h"
32 #include "components/translate/core/browser/translate_download_manager.h" 34 #include "components/translate/core/browser/translate_download_manager.h"
33 #include "components/translate/core/browser/translate_infobar_delegate.h" 35 #include "components/translate/core/browser/translate_infobar_delegate.h"
34 #include "components/translate/core/browser/translate_manager.h" 36 #include "components/translate/core/browser/translate_manager.h"
35 #include "components/translate/core/browser/translate_prefs.h" 37 #include "components/translate/core/browser/translate_prefs.h"
36 #include "components/translate/core/common/language_detection_details.h" 38 #include "components/translate/core/common/language_detection_details.h"
37 #include "components/variations/service/variations_service.h" 39 #include "components/variations/service/variations_service.h"
38 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
39 #include "content/public/browser/render_view_host.h" 41 #include "content/public/browser/render_view_host.h"
40 #include "content/public/browser/web_contents.h" 42 #include "content/public/browser/web_contents.h"
41 #include "url/gurl.h" 43 #include "url/gurl.h"
42 44
43 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeTranslateClient); 45 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeTranslateClient);
44 46
45 ChromeTranslateClient::ChromeTranslateClient(content::WebContents* web_contents) 47 ChromeTranslateClient::ChromeTranslateClient(content::WebContents* web_contents)
46 : content::WebContentsObserver(web_contents), 48 : content::WebContentsObserver(web_contents),
47 translate_driver_(&web_contents->GetController()), 49 translate_driver_(&web_contents->GetController()),
48 translate_manager_( 50 translate_manager_(
49 new translate::TranslateManager(this, prefs::kAcceptLanguages)) { 51 new translate::TranslateManager(this, prefs::kAcceptLanguages)),
52 language_model_(
53 LanguageModelFactory::GetInstance()->GetForBrowserContext(
54 web_contents->GetBrowserContext())) {
50 translate_driver_.AddObserver(this); 55 translate_driver_.AddObserver(this);
51 translate_driver_.set_translate_manager(translate_manager_.get()); 56 translate_driver_.set_translate_manager(translate_manager_.get());
52 } 57 }
53 58
54 ChromeTranslateClient::~ChromeTranslateClient() { 59 ChromeTranslateClient::~ChromeTranslateClient() {
55 translate_driver_.RemoveObserver(this); 60 translate_driver_.RemoveObserver(this);
56 } 61 }
57 62
58 translate::LanguageState& ChromeTranslateClient::GetLanguageState() { 63 translate::LanguageState& ChromeTranslateClient::GetLanguageState() {
59 return translate_manager_->GetLanguageState(); 64 return translate_manager_->GetLanguageState();
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 // ContentTranslateDriver::Observer implementation. 274 // ContentTranslateDriver::Observer implementation.
270 275
271 void ChromeTranslateClient::OnLanguageDetermined( 276 void ChromeTranslateClient::OnLanguageDetermined(
272 const translate::LanguageDetectionDetails& details) { 277 const translate::LanguageDetectionDetails& details) {
273 // TODO: Remove translate notifications and have the clients be 278 // TODO: Remove translate notifications and have the clients be
274 // ContentTranslateDriver::Observer directly instead. 279 // ContentTranslateDriver::Observer directly instead.
275 content::NotificationService::current()->Notify( 280 content::NotificationService::current()->Notify(
276 chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, 281 chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
277 content::Source<content::WebContents>(web_contents()), 282 content::Source<content::WebContents>(web_contents()),
278 content::Details<const translate::LanguageDetectionDetails>(&details)); 283 content::Details<const translate::LanguageDetectionDetails>(&details));
284
285 // Unless we have no language model (e.g., in incognito), notify the model
286 // about detected language of every page visited.
287 if (language_model_ && details.is_cld_reliable)
288 language_model_->OnPageVisited(details.cld_language);
279 } 289 }
280 290
281 void ChromeTranslateClient::OnPageTranslated( 291 void ChromeTranslateClient::OnPageTranslated(
282 const std::string& original_lang, 292 const std::string& original_lang,
283 const std::string& translated_lang, 293 const std::string& translated_lang,
284 translate::TranslateErrors::Type error_type) { 294 translate::TranslateErrors::Type error_type) {
285 // TODO: Remove translate notifications and have the clients be 295 // TODO: Remove translate notifications and have the clients be
286 // ContentTranslateDriver::Observer directly instead. 296 // ContentTranslateDriver::Observer directly instead.
287 DCHECK(web_contents()); 297 DCHECK(web_contents());
288 translate::PageTranslatedDetails details; 298 translate::PageTranslatedDetails details;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 if (GetLanguageState().InTranslateNavigation()) 336 if (GetLanguageState().InTranslateNavigation())
327 return; 337 return;
328 } 338 }
329 339
330 TranslateBubbleFactory::Show(browser->window(), web_contents(), step, 340 TranslateBubbleFactory::Show(browser->window(), web_contents(), step,
331 error_type); 341 error_type);
332 #else 342 #else
333 NOTREACHED(); 343 NOTREACHED();
334 #endif 344 #endif
335 } 345 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/chrome_translate_client.h ('k') | chrome/browser/translate/language_model_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698