mash: Migrate locale observer and notification to common.

ash/common/system/locale/locale_notification_controller.cc

 // Copyright 2013 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 "ash/system/locale/locale_notification_controller.h"
+#include "ash/common/system/locale/locale_notification_controller.h"
 
 #include <utility>
 
 #include "ash/common/system/system_notifier.h"
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray_notifier.h"
+#include "ash/common/system/tray/wm_system_tray_notifier.h"
+#include "ash/common/wm_shell.h"
 #include "base/strings/string16.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_delegate.h"
 #include "ui/message_center/notification_types.h"
 
@@ skipping 18 matching lines @@
   void ButtonClick(int button_index) override;
 
  private:
   LocaleObserver::Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(LocaleNotificationDelegate);
 };
 
 LocaleNotificationDelegate::LocaleNotificationDelegate(
     LocaleObserver::Delegate* delegate)
-  : delegate_(delegate) {
+    : delegate_(delegate) {
   DCHECK(delegate_);
 }
 
-LocaleNotificationDelegate::~LocaleNotificationDelegate() {
-}
+LocaleNotificationDelegate::~LocaleNotificationDelegate() {}
 
 void LocaleNotificationDelegate::Close(bool by_user) {
   delegate_->AcceptLocaleChange();
 }
 
 bool LocaleNotificationDelegate::HasClickedListener() {
   return true;
 }
 
 void LocaleNotificationDelegate::Click() {
   delegate_->AcceptLocaleChange();
 }
 
 void LocaleNotificationDelegate::ButtonClick(int button_index) {
   DCHECK_EQ(0, button_index);
   delegate_->RevertLocaleChange();
 }
 
 }  // namespace
 
 LocaleNotificationController::LocaleNotificationController() {
-  Shell::GetInstance()->system_tray_notifier()->AddLocaleObserver(this);
+  WmShell::Get()->system_tray_notifier()->AddLocaleObserver(this);
 }
 
 LocaleNotificationController::~LocaleNotificationController() {
-  Shell::GetInstance()->system_tray_notifier()->RemoveLocaleObserver(this);
+  WmShell::Get()->system_tray_notifier()->RemoveLocaleObserver(this);
 }
 
 void LocaleNotificationController::OnLocaleChanged(
     LocaleObserver::Delegate* delegate,
     const std::string& cur_locale,
     const std::string& from_locale,
     const std::string& to_locale) {
   if (!delegate)
     return;
 
@@ skipping 17 matching lines @@
       bundle.GetImageNamed(IDR_AURA_UBER_TRAY_LOCALE),
       base::string16() /* display_source */, GURL(),
       message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT,
                                  system_notifier::kNotifierLocale),
       optional, new LocaleNotificationDelegate(delegate)));
   message_center::MessageCenter::Get()->AddNotification(
       std::move(notification));
 }
 
 }  // namespace ash