Revert of ChromeOS: should not show "Language changed" notification for certain languages.

chrome/browser/chromeos/locale_change_guard.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/chromeos/locale_change_guard.h"
 
-#include <algorithm>
-
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/theme_resources.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::UserMetricsAction;
 using content::WebContents;
 
 namespace chromeos {
 
-namespace {
-
-// This is the list of languages that do not require user notification when
-// locale is switched automatically between regions within the same language.
-//
-// New language in kAcceptLanguageList should be added either here or to
-// to the exception list in unit test.
-const char* const kSkipShowNotificationLanguages[4] = {"en", "de", "fr", "it"};
-
-}  // anonymous namespace
-
 LocaleChangeGuard::LocaleChangeGuard(Profile* profile)
     : profile_(profile),
       reverted_(false),
       session_started_(false),
       main_frame_loaded_(false) {
   DCHECK(profile_);
   registrar_.Add(this, chrome::NOTIFICATION_OWNERSHIP_STATUS_CHANGED,
                  content::NotificationService::AllSources());
 }
 
@@ skipping 100 matching lines @@
     return;
   }
 
   std::string from_locale = prefs->GetString(prefs::kApplicationLocaleBackup);
   if (from_locale.empty() || from_locale == to_locale)
     return;  // No locale change was detected, just exit.
 
   if (prefs->GetString(prefs::kApplicationLocaleAccepted) == to_locale)
     return;  // Already accepted.
 
-  // Locale change detected.
-  if (!ShouldShowLocaleChangeNotification(from_locale, to_locale))
-    return;
-
-  // Showing notification.
+  // Locale change detected, showing notification.
   if (from_locale_ != from_locale || to_locale_ != to_locale) {
     // Falling back to showing message in current locale.
     LOG(ERROR) <<
         "Showing locale change notification in current (not previous) language";
     PrepareChangingLocale(from_locale, to_locale);
   }
 
   ash::Shell::GetInstance()->system_tray_notifier()->NotifyLocaleChanged(
       this, cur_locale, from_locale_, to_locale_);
 }
@@ skipping 38 matching lines @@
 
     title_text_ = l10n_util::GetStringUTF16(
         IDS_OPTIONS_SETTINGS_SECTION_TITLE_LANGUAGE);
     message_text_ = l10n_util::GetStringFUTF16(
         IDS_LOCALE_CHANGE_MESSAGE, from, to);
     revert_link_text_ = l10n_util::GetStringFUTF16(
         IDS_LOCALE_CHANGE_REVERT_MESSAGE, from);
   }
 }
 
-// static
-bool LocaleChangeGuard::ShouldShowLocaleChangeNotification(
-    const std::string& from_locale,
-    const std::string& to_locale) {
-  const std::string from_lang = l10n_util::GetLanguage(from_locale);
-  const std::string to_lang = l10n_util::GetLanguage(to_locale);
-
-  if (from_locale == to_locale)
-    return false;
-
-  if (from_lang != to_lang)
-    return true;
-
-  const char* const* begin = kSkipShowNotificationLanguages;
-  const char* const* end = kSkipShowNotificationLanguages +
-                           arraysize(kSkipShowNotificationLanguages);
-
-  return std::find(begin, end, from_lang) == end;
-}
-
-// static
-const char* const*
-LocaleChangeGuard::GetSkipShowNotificationLanguagesForTesting() {
-  return kSkipShowNotificationLanguages;
-}
-
-// static
-size_t LocaleChangeGuard::GetSkipShowNotificationLanguagesSizeForTesting() {
-  return arraysize(kSkipShowNotificationLanguages);
-}
-
 }  // namespace chromeos