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

Unified Diff: chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc

Issue 143003020: Move TranslateLanguageList to the Translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@removeDelegate
Patch Set: rebase Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
index 8d7b1959b09b5449536eb6978065ddb3809405eb..7644439b3148c9bcc50bade01eb42270ad6625d1 100644
--- a/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
+++ b/chrome/browser/ui/webui/translate_internals/translate_internals_handler.cc
@@ -14,18 +14,32 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/translate/translate_prefs.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"
#include "components/translate/core/browser/translate_event_details.h"
#include "components/translate/core/common/language_detection_details.h"
+#include "components/translate/core/common/translate_pref_names.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
TranslateInternalsHandler::TranslateInternalsHandler() {
TranslateManager::GetInstance()->AddObserver(this);
+ TranslateLanguageList* language_list =
+ TranslateDownloadManager::GetInstance()->language_list();
+ if (!language_list) {
+ NOTREACHED();
+ return;
+ }
+
+ event_subscription_ = language_list->RegisterEventCallback(base::Bind(
+ &TranslateInternalsHandler::OnTranslateEvent, base::Unretained(this)));
}
TranslateInternalsHandler::~TranslateInternalsHandler() {
TranslateManager::GetInstance()->RemoveObserver(this);
+
+ // |event_subscription_| is deleted automatically and un-registers the
+ // callback automatically.
}
void TranslateInternalsHandler::RegisterMessages() {
@@ -166,9 +180,9 @@ void TranslateInternalsHandler::SendSupportedLanguagesToJs() {
base::DictionaryValue dict;
std::vector<std::string> languages;
- TranslateManager::GetSupportedLanguages(&languages);
+ TranslateDownloadManager::GetSupportedLanguages(&languages);
base::Time last_updated =
- TranslateManager::GetSupportedLanguagesLastUpdated();
+ TranslateDownloadManager::GetSupportedLanguagesLastUpdated();
base::ListValue* languages_list = new base::ListValue();
base::ListValue* alpha_languages_list = new base::ListValue();
@@ -176,7 +190,7 @@ void TranslateInternalsHandler::SendSupportedLanguagesToJs() {
it != languages.end(); ++it) {
const std::string& lang = *it;
languages_list->Append(new base::StringValue(lang));
- if (TranslateManager::IsAlphaLanguage(lang))
+ if (TranslateDownloadManager::IsAlphaLanguage(lang))
alpha_languages_list->Append(new base::StringValue(lang));
}
« no previous file with comments | « chrome/browser/ui/webui/translate_internals/translate_internals_handler.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698