Translate: Adding a flag to enable "alpha language" translation

chrome/browser/translate/translate_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/translate_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
@@ skipping 31 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "google_apis/google_api_keys.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
+#include "net/base/url_util.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #ifdef FILE_MANAGER_EXTENSION
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #endif
 
 using content::NavigationController;
 using content::NavigationEntry;
@@ skipping 72 matching lines @@
 
 const char* const kTranslateScriptURL =
     "https://translate.google.com/translate_a/element.js";
 const char* const kTranslateScriptQuery =
     "?cb=cr.googleTranslate.onTranslateElementLoad&hl=%s";
 const char* const kTranslateScriptHeader =
     "Google-Translate-Element-Mode: library";
 const char* const kReportLanguageDetectionErrorURL =
     "https://translate.google.com/translate_error";
 const char* const kLanguageListFetchURL =
-    "https://translate.googleapis.com/translate_a/l?client=chrome&cb=sl&hl=%s";
+    "https://translate.googleapis.com/translate_a/l?client=chrome&cb=sl";
+
+const char* const kLanguageListFetchLocaleQueryName = "hl";
+const char* const kLanguageListFetchAlphaLanguageQueryName = "alpha";
+const char* const kLanguageListFetchAlphaLanguageQueryValue = "1";
+
 const int kMaxRetryLanguageListFetch = 5;
 const int kTranslateScriptExpirationDelayDays = 1;
 
 void AddApiKeyToUrl(GURL* url) {
   std::string api_key = google_apis::GetAPIKey();
   std::string query(url->query());
   if (!query.empty())
     query += "&";
   query += "key=" + net::EscapeQueryParamValue(api_key, true);
   GURL::Replacements replacements;
@@ skipping 614 matching lines @@
     return;
 
   // We don't want to do this when translate is disabled.
   DCHECK(prefs != NULL);
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableTranslate) ||
       (prefs != NULL && !prefs->GetBoolean(prefs::kEnableTranslate))) {
     return;
   }
 
-  GURL language_list_fetch_url = GURL(
-      base::StringPrintf(
-          kLanguageListFetchURL,
-          GetLanguageCode(g_browser_process->GetApplicationLocale()).c_str()));
+  GURL language_list_fetch_url = GURL(kLanguageListFetchURL);
+  language_list_fetch_url = net::AppendQueryParameter(
+      language_list_fetch_url,
+      kLanguageListFetchLocaleQueryName,
+      GetLanguageCode(g_browser_process->GetApplicationLocale()).c_str());
+
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kEnableTranslateAlphaLanguages)) {
+    language_list_fetch_url = net::AppendQueryParameter(
+        language_list_fetch_url,
+        kLanguageListFetchAlphaLanguageQueryName,
+        kLanguageListFetchAlphaLanguageQueryValue);
+  }
   AddApiKeyToUrl(&language_list_fetch_url);
+  VLOG(9) << "Fetch supporting language list from: "
+          << language_list_fetch_url.spec().c_str();
+
   language_list_request_pending_.reset(net::URLFetcher::Create(
       1, language_list_fetch_url, net::URLFetcher::GET, this));
   language_list_request_pending_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                                net::LOAD_DO_NOT_SAVE_COOKIES);
   language_list_request_pending_->SetRequestContext(
       g_browser_process->system_request_context());
   language_list_request_pending_->SetMaxRetriesOn5xx(
       kMaxRetryLanguageListFetch);
   language_list_request_pending_->Start();
 }
@@ skipping 60 matching lines @@
   // list or not at all if no such candidate exists
   std::vector<std::string>::iterator iter;
   for (iter = accept_langs_list.begin();
        iter != accept_langs_list.end(); ++iter) {
     std::string lang_code = GetLanguageCode(*iter);
     if (IsSupportedLanguage(lang_code))
       return lang_code;
   }
   return std::string();
 }