OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/translate_tab_helper.h" | 5 #include "chrome/browser/translate/translate_tab_helper.h" |
6 | 6 |
7 #include "chrome/browser/translate/page_translated_details.h" | 7 #include "chrome/browser/translate/page_translated_details.h" |
8 #include "chrome/common/chrome_notification_types.h" | 8 #include "chrome/common/chrome_notification_types.h" |
| 9 #include "chrome/common/language_detection_details.h" |
9 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
10 #include "content/public/browser/notification_service.h" | 11 #include "content/public/browser/notification_service.h" |
11 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
12 | 13 |
13 using content::WebContents; | 14 using content::WebContents; |
14 | 15 |
15 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TranslateTabHelper); | 16 DEFINE_WEB_CONTENTS_USER_DATA_KEY(TranslateTabHelper); |
16 | 17 |
17 TranslateTabHelper::TranslateTabHelper(WebContents* web_contents) | 18 TranslateTabHelper::TranslateTabHelper(WebContents* web_contents) |
18 : content::WebContentsObserver(web_contents), | 19 : content::WebContentsObserver(web_contents), |
(...skipping 15 matching lines...) Expand all Loading... |
34 return handled; | 35 return handled; |
35 } | 36 } |
36 | 37 |
37 void TranslateTabHelper::DidNavigateAnyFrame( | 38 void TranslateTabHelper::DidNavigateAnyFrame( |
38 const content::LoadCommittedDetails& details, | 39 const content::LoadCommittedDetails& details, |
39 const content::FrameNavigateParams& params) { | 40 const content::FrameNavigateParams& params) { |
40 // Let the LanguageState clear its state. | 41 // Let the LanguageState clear its state. |
41 language_state_.DidNavigate(details); | 42 language_state_.DidNavigate(details); |
42 } | 43 } |
43 | 44 |
44 void TranslateTabHelper::OnLanguageDetermined(const std::string& language, | 45 void TranslateTabHelper::OnLanguageDetermined( |
45 bool page_needs_translation) { | 46 const LanguageDetectionDetails& details, |
46 language_state_.LanguageDetermined(language, page_needs_translation); | 47 bool page_needs_translation) { |
| 48 language_state_.LanguageDetermined(details.adopted_language, |
| 49 page_needs_translation); |
47 | 50 |
48 std::string lang = language; | |
49 content::NotificationService::current()->Notify( | 51 content::NotificationService::current()->Notify( |
50 chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, | 52 chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, |
51 content::Source<WebContents>(web_contents()), | 53 content::Source<WebContents>(web_contents()), |
52 content::Details<std::string>(&lang)); | 54 content::Details<const LanguageDetectionDetails>(&details)); |
53 } | 55 } |
54 | 56 |
55 void TranslateTabHelper::OnPageTranslated(int32 page_id, | 57 void TranslateTabHelper::OnPageTranslated(int32 page_id, |
56 const std::string& original_lang, | 58 const std::string& original_lang, |
57 const std::string& translated_lang, | 59 const std::string& translated_lang, |
58 TranslateErrors::Type error_type) { | 60 TranslateErrors::Type error_type) { |
59 language_state_.set_current_language(translated_lang); | 61 language_state_.set_current_language(translated_lang); |
60 language_state_.set_translation_pending(false); | 62 language_state_.set_translation_pending(false); |
61 PageTranslatedDetails details(original_lang, translated_lang, error_type); | 63 PageTranslatedDetails details(original_lang, translated_lang, error_type); |
62 content::NotificationService::current()->Notify( | 64 content::NotificationService::current()->Notify( |
63 chrome::NOTIFICATION_PAGE_TRANSLATED, | 65 chrome::NOTIFICATION_PAGE_TRANSLATED, |
64 content::Source<WebContents>(web_contents()), | 66 content::Source<WebContents>(web_contents()), |
65 content::Details<PageTranslatedDetails>(&details)); | 67 content::Details<PageTranslatedDetails>(&details)); |
66 } | 68 } |
OLD | NEW |