Added and replaced some UMAs

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 36 matching lines @@
 #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/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #ifdef FILE_MANAGER_EXTENSION
 #include "chrome/browser/chromeos/extensions/file_manager/file_manager_util.h"
 #include "extensions/common/constants.h"
 #endif
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
@@ skipping 240 matching lines @@
     return chrome_locale;
   return chrome_locale.substr(0, hypen_index);
 }
 
 // static
 bool TranslateManager::IsSupportedLanguage(const std::string& page_language) {
   InitSupportedLanguages();
   return supported_languages_.Pointer()->count(page_language) != 0;
 }
 
+// static
+bool TranslateManager::IsAvailableLanguage(const std::string& language) {
+  std::string locale = g_browser_process->GetApplicationLocale();

[Takashi Toyoshima, 2013/05/21 11:11:43]

const std::string&

[hajimehoshi, 2013/05/22 04:19:27]

Done.

+  return l10n_util::IsLocaleNameTranslated(language, locale);;
+}
+
 void TranslateManager::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
       NavigationController* controller =
           content::Source<NavigationController>(source).ptr();
       content::LoadCommittedDetails* load_details =
           content::Details<content::LoadCommittedDetails>(details).ptr();
       NavigationEntry* entry = controller->GetActiveEntry();
@@ skipping 238 matching lines @@
     TranslateManagerMetrics::ReportInitiationStatus(
         TranslateManagerMetrics::INITIATION_STATUS_ACCEPT_LANGUAGES);
     return;
   }
 
   // Nothing to do if either the language Chrome is in or the language of the
   // page is not supported by the translation server.
   if (target_lang.empty() || !IsSupportedLanguage(language_code)) {
     TranslateManagerMetrics::ReportInitiationStatus(
         TranslateManagerMetrics::INITIATION_STATUS_LANGUAGE_IS_NOT_SUPPORTED);
+    TranslateManagerMetrics::ReportUnsupportedLanguageAtInitiation(
+        language_code);
+
     return;
   }
 
   // Don't translate any user black-listed URLs or user selected language
   // combination.
   if (!TranslatePrefs::CanTranslate(prefs, language_code, page_url)) {
     TranslateManagerMetrics::ReportInitiationStatus(
         TranslateManagerMetrics::INITIATION_STATUS_DISABLED_BY_CONFIG);
     return;
   }
@@ skipping 169 matching lines @@
     return;
 
   translate_tab_helper->language_state().set_translation_pending(true);
   web_contents->GetRenderViewHost()->Send(new ChromeViewMsg_TranslatePage(
       web_contents->GetRenderViewHost()->GetRoutingID(), entry->GetPageID(),
       translate_script, source_lang, target_lang));
 }
 
 void TranslateManager::PageTranslated(WebContents* web_contents,
                                       PageTranslatedDetails* details) {
-  if ((details->error_type == TranslateErrors::NONE) &&
-      !IsSupportedLanguage(details->source_language)) {
+  if (details->error_type == TranslateErrors::NONE) {
     // TODO(jcivelli): http://crbug.com/9390 We should change the "after

[Takashi Toyoshima, 2013/05/21 11:11:43]

remove this TODO.

[hajimehoshi, 2013/05/22 04:19:27]

Done.

     //                 translate" infobar to support unknown as the original
     //                 language.
-    TranslateManagerMetrics::ReportUnsupportedLanguage();
-    details->error_type = TranslateErrors::UNSUPPORTED_LANGUAGE;
+    std::string language = details->source_language;

[Takashi Toyoshima, 2013/05/21 11:11:43]

const std::string&

[hajimehoshi, 2013/05/22 04:19:27]

Done.

+    if (!IsAvailableLanguage(language)) {
+      TranslateManagerMetrics::ReportUnavailableLanguage(language);
+      details->error_type = TranslateErrors::UNSUPPORTED_LANGUAGE;
+    }
   }
+
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   PrefService* prefs = profile->GetPrefs();
   TranslateInfoBarDelegate::Create(
       InfoBarService::FromWebContents(web_contents), true,
       (details->error_type == TranslateErrors::NONE) ?
           TranslateInfoBarDelegate::AFTER_TRANSLATE :
           TranslateInfoBarDelegate::TRANSLATION_ERROR,
       details->error_type, prefs, ShortcutConfig(), details->source_language,
       details->target_language);
@@ skipping 181 matching lines @@
   // reason so we are more aggressive showing the shortcuts for never translate.
   #if defined(OS_ANDROID)
   config.never_translate_min_count = 1;
   #else
   config.never_translate_min_count = 3;
   #endif  // defined(OS_ANDROID)
 
   config.always_translate_min_count = 3;
   return config;
 }