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

Unified Diff: chrome/browser/translate/translate_service.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
« no previous file with comments | « chrome/browser/translate/translate_service.h ('k') | chrome/browser/translate/translate_ui_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/translate_service.cc
diff --git a/chrome/browser/translate/translate_service.cc b/chrome/browser/translate/translate_service.cc
index 8bc6922eb88c3381907ec7afbf38c1ffed2caf77..cfd2edc2280720ffbec89a315133ffab4ed4f772 100644
--- a/chrome/browser/translate/translate_service.cc
+++ b/chrome/browser/translate/translate_service.cc
@@ -8,8 +8,25 @@
#include "chrome/browser/translate/translate_manager.h"
#include "components/translate/core/browser/translate_download_manager.h"
+namespace {
+// The singleton instance of TranslateService.
+TranslateService* g_translate_service = NULL;
+}
+
+TranslateService::TranslateService() {
+ resource_request_allowed_notifier_.Init(this);
+}
+
+TranslateService::~TranslateService() {}
+
// static
void TranslateService::Initialize() {
+ if (g_translate_service)
+ return;
+
+ g_translate_service = new TranslateService;
+ // Initialize the allowed state for resource requests.
+ g_translate_service->OnResourceRequestsAllowed();
// Create the TranslateManager singleton.
TranslateManager::GetInstance();
TranslateDownloadManager* download_manager =
@@ -22,7 +39,25 @@ void TranslateService::Initialize() {
// static
void TranslateService::Shutdown(bool cleanup_pending_fetcher) {
- if (cleanup_pending_fetcher)
+ TranslateDownloadManager* download_manager =
+ TranslateDownloadManager::GetInstance();
+ if (cleanup_pending_fetcher) {
TranslateManager::GetInstance()->CleanupPendingUlrFetcher();
- TranslateDownloadManager::GetInstance()->set_request_context(NULL);
+ download_manager->Shutdown();
+ } else {
+ // This path is only used by tests.
+ download_manager->set_request_context(NULL);
+ }
+}
+
+void TranslateService::OnResourceRequestsAllowed() {
+ TranslateLanguageList* language_list =
+ TranslateDownloadManager::GetInstance()->language_list();
+ if (!language_list) {
+ NOTREACHED();
+ return;
+ }
+
+ language_list->SetResourceRequestsAllowed(
+ resource_request_allowed_notifier_.ResourceRequestsAllowed());
}
« no previous file with comments | « chrome/browser/translate/translate_service.h ('k') | chrome/browser/translate/translate_ui_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698