#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/translate/chrome_translate_client.h"
#include "chrome/browser/translate/translate_service.h"
-#include "chrome/browser/translate/translate_tab_helper.h"
#include "chrome/common/pref_names.h"
#include "components/translate/core/browser/translate_download_manager.h"
#include "components/translate/core/browser/translate_error_details.h"
chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
content::NotificationService::AllSources());
- error_subscription_ = TranslateManager::RegisterTranslateErrorCallback(
- base::Bind(&TranslateInternalsHandler::OnTranslateError,
- base::Unretained(this)));
+ error_subscription_ =
+ translate::TranslateManager::RegisterTranslateErrorCallback(
+ base::Bind(&TranslateInternalsHandler::OnTranslateError,
+ base::Unretained(this)));
- TranslateLanguageList* language_list =
- TranslateDownloadManager::GetInstance()->language_list();
+ translate::TranslateLanguageList* language_list =
+ translate::TranslateDownloadManager::GetInstance()->language_list();
if (!language_list) {
NOTREACHED();
return;
const content::NotificationSource& source,
const content::NotificationDetails& details) {
DCHECK_EQ(chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED, type);
- const LanguageDetectionDetails* language_detection_details =
- content::Details<const LanguageDetectionDetails>(details).ptr();
+ const translate::LanguageDetectionDetails* language_detection_details =
+ content::Details<const translate::LanguageDetectionDetails>(details)
+ .ptr();
content::WebContents* web_contents =
content::Source<content::WebContents>(source).ptr();
}
void TranslateInternalsHandler::OnTranslateError(
- const TranslateErrorDetails& details) {
+ const translate::TranslateErrorDetails& details) {
base::DictionaryValue dict;
dict.Set("time",
new base::FundamentalValue(details.time.ToJsTime()));
}
void TranslateInternalsHandler::OnTranslateEvent(
- const TranslateEventDetails& details) {
+ const translate::TranslateEventDetails& details) {
base::DictionaryValue dict;
dict.Set("time", new base::FundamentalValue(details.time.ToJsTime()));
dict.Set("filename", new base::StringValue(details.filename));
Profile* profile =
Profile::FromBrowserContext(web_contents->GetBrowserContext());
PrefService* prefs = profile->GetOriginalProfile()->GetPrefs();
- scoped_ptr<TranslatePrefs> translate_prefs(
- TranslateTabHelper::CreateTranslatePrefs(prefs));
+ scoped_ptr<translate::TranslatePrefs> translate_prefs(
+ ChromeTranslateClient::CreateTranslatePrefs(prefs));
std::string pref_name;
if (!args->GetString(0, &pref_name))
if (!args->GetString(2, &to))
return;
translate_prefs->RemoveLanguagePairFromWhitelist(from, to);
+ } else if (pref_name == "too_often_denied") {
+ translate_prefs->ResetDenialState();
} else {
return;
}
std::vector<std::string> keys;
keys.push_back(prefs::kEnableTranslate);
- keys.push_back(TranslatePrefs::kPrefTranslateBlockedLanguages);
- keys.push_back(TranslatePrefs::kPrefTranslateLanguageBlacklist);
- keys.push_back(TranslatePrefs::kPrefTranslateSiteBlacklist);
- keys.push_back(TranslatePrefs::kPrefTranslateWhitelists);
- keys.push_back(TranslatePrefs::kPrefTranslateDeniedCount);
- keys.push_back(TranslatePrefs::kPrefTranslateAcceptedCount);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateBlockedLanguages);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateLanguageBlacklist);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateSiteBlacklist);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateWhitelists);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateDeniedCount);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateAcceptedCount);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateLastDeniedTime);
+ keys.push_back(translate::TranslatePrefs::kPrefTranslateTooOftenDenied);
for (std::vector<std::string>::const_iterator it = keys.begin();
it != keys.end(); ++it) {
base::DictionaryValue dict;
std::vector<std::string> languages;
- TranslateDownloadManager::GetSupportedLanguages(&languages);
+ translate::TranslateDownloadManager::GetSupportedLanguages(&languages);
base::Time last_updated =
- TranslateDownloadManager::GetSupportedLanguagesLastUpdated();
+ translate::TranslateDownloadManager::GetSupportedLanguagesLastUpdated();
base::ListValue* languages_list = new base::ListValue();
base::ListValue* alpha_languages_list = new base::ListValue();
it != languages.end(); ++it) {
const std::string& lang = *it;
languages_list->Append(new base::StringValue(lang));
- if (TranslateDownloadManager::IsAlphaLanguage(lang))
+ if (translate::TranslateDownloadManager::IsAlphaLanguage(lang))
alpha_languages_list->Append(new base::StringValue(lang));
}