ash: Use mojo LocaleNotificationController interface.

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/common/system/tray/system_tray_notifier.h"
-#include "ash/common/wm_shell.h"
 #include "base/bind.h"
 #include "base/macros.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/ash/ash_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"

[msw, 2016/10/17 22:19:34]

nit: remove

[Elliot Glaysher, 2016/10/17 22:37:17]

Done.

 #include "components/prefs/pref_service.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 "content/public/common/service_manager_connection.h"
+#include "services/service_manager/public/cpp/connector.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
@@ skipping 17 matching lines @@
 
 LocaleChangeGuard::~LocaleChangeGuard() {}
 
 void LocaleChangeGuard::OnLogin() {
   registrar_.Add(this, chrome::NOTIFICATION_SESSION_STARTED,
                  content::NotificationService::AllSources());
   registrar_.Add(this, content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
                  content::NotificationService::AllBrowserContextsAndSources());
 }
 
+void LocaleChangeGuard::ConnectToLocaleNotificationController() {
+  auto connection = content::ServiceManagerConnection::GetForProcess();

[msw, 2016/10/17 22:19:34]

nit: James asked me to avoid auto for these types in another CL... I guess you
should probably do the same.

[Elliot Glaysher, 2016/10/17 22:37:17]

Done.

+  auto connector = connection ? connection->GetConnector() : nullptr;
+  // Unit tests may not have a connector.
+  if (!connector)
+    return;
+
+  if (chrome::IsRunningInMash()) {
+    connector->ConnectToInterface("service:ash", &notification_controller_);
+  } else {
+    connector->ConnectToInterface("service:content_browser",
+                                  &notification_controller_);
+  }
+}
+
 void LocaleChangeGuard::RevertLocaleChange() {
   if (profile_ == NULL ||
       from_locale_.empty() ||
       to_locale_.empty()) {
     NOTREACHED();
     return;
   }
   if (reverted_)
     return;
   reverted_ = true;
@@ skipping 93 matching lines @@
     return;
 
   // 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::WmShell::Get()->system_tray_notifier()->NotifyLocaleChanged(
-      this, cur_locale, from_locale_, to_locale_);
+  if (!notification_controller_)
+    ConnectToLocaleNotificationController();
+
+  notification_controller_->OnLocaleChanged(
+      cur_locale, from_locale_, to_locale_,
+      base::Bind(&LocaleChangeGuard::OnResult, AsWeakPtr()));
+}
+
+void LocaleChangeGuard::OnResult(ash::mojom::LocaleNotificationResult result) {
+  switch (result) {
+    case ash::mojom::LocaleNotificationResult::ACCEPT:
+      AcceptLocaleChange();
+      break;
+    case ash::mojom::LocaleNotificationResult::REVERT:
+      RevertLocaleChange();
+      break;
+  }
 }
 
 void LocaleChangeGuard::AcceptLocaleChange() {
   if (profile_ == NULL ||
       from_locale_.empty() ||
       to_locale_.empty()) {
     NOTREACHED();
     return;
   }
 
@@ skipping 13 matching lines @@
   prefs->SetString(prefs::kApplicationLocaleAccepted, to_locale_);
 }
 
 void LocaleChangeGuard::PrepareChangingLocale(
     const std::string& from_locale, const std::string& to_locale) {
   std::string cur_locale = g_browser_process->GetApplicationLocale();
   if (!from_locale.empty())
     from_locale_ = from_locale;
   if (!to_locale.empty())
     to_locale_ = to_locale;
-
-  if (!from_locale_.empty() && !to_locale_.empty()) {
-    base::string16 from = l10n_util::GetDisplayNameForLocale(
-        from_locale_, cur_locale, true);
-    base::string16 to = l10n_util::GetDisplayNameForLocale(
-        to_locale_, cur_locale, true);
-
-    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)
@@ skipping 14 matching lines @@
 LocaleChangeGuard::GetSkipShowNotificationLanguagesForTesting() {
   return kSkipShowNotificationLanguages;
 }
 
 // static
 size_t LocaleChangeGuard::GetSkipShowNotificationLanguagesSizeForTesting() {
   return arraysize(kSkipShowNotificationLanguages);
 }
 
 }  // namespace chromeos