chromeos: Make ash system tray directly observe IME state changes

chrome/browser/ui/ash/system_tray_delegate_chromeos.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 "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/login_status.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/system/date/clock_observer.h"
-#include "ash/system/ime/ime_observer.h"
 #include "ash/system/power/power_status.h"
 #include "ash/system/session/logout_button_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray_accessibility.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/user_metrics.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
@@ skipping 18 matching lines @@
 #include "chromeos/login/login_state.h"
 #include "chromeos/network/portal_detector/network_portal_detector.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/session_manager/core/session_manager.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_service.h"
-#include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/chromeos/events/pref_names.h"
-#include "ui/chromeos/ime/input_method_menu_manager.h"
 
 namespace chromeos {
 
 namespace {
 
 // The minimum session length limit that can be set.
 const int kSessionLengthLimitMinMs = 30 * 1000;  // 30 seconds.
 
 // The maximum session length limit that can be set.
 const int kSessionLengthLimitMaxMs = 24 * 60 * 60 * 1000;  // 24 hours.
@@ skipping 26 matching lines @@
                   content::NotificationService::AllSources());
 
   AccessibilityManager* accessibility_manager = AccessibilityManager::Get();
   CHECK(accessibility_manager);
   accessibility_subscription_ = accessibility_manager->RegisterCallback(
       base::Bind(&SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged,
                  base::Unretained(this)));
 }
 
 void SystemTrayDelegateChromeOS::Initialize() {
-  input_method::InputMethodManager::Get()->AddObserver(this);
-  input_method::InputMethodManager::Get()->AddImeMenuObserver(this);
-  ui::ime::InputMethodMenuManager::GetInstance()->AddObserver(this);
-
   BrowserList::AddObserver(this);
 
   local_state_registrar_.reset(new PrefChangeRegistrar);
   local_state_registrar_->Init(g_browser_process->local_state());
 
   UpdateSessionStartTime();
   UpdateSessionLengthLimit();
 
   local_state_registrar_->Add(
       prefs::kSessionStartTime,
       base::Bind(&SystemTrayDelegateChromeOS::UpdateSessionStartTime,
                  base::Unretained(this)));
   local_state_registrar_->Add(
       prefs::kSessionLengthLimit,
       base::Bind(&SystemTrayDelegateChromeOS::UpdateSessionLengthLimit,
                  base::Unretained(this)));
 }
 
 SystemTrayDelegateChromeOS::~SystemTrayDelegateChromeOS() {
   // Unregister PrefChangeRegistrars.
   local_state_registrar_.reset();
   user_pref_registrar_.reset();
 
   // Unregister content notifications before destroying any components.
   registrar_.reset();
 
   // Unregister a11y status subscription.
   accessibility_subscription_.reset();
 
-  input_method::InputMethodManager::Get()->RemoveObserver(this);
-  ui::ime::InputMethodMenuManager::GetInstance()->RemoveObserver(this);
-
   BrowserList::RemoveObserver(this);
   StopObservingAppWindowRegistry();
 }
 
 void SystemTrayDelegateChromeOS::ShowUserLogin() {
   if (!ash::Shell::Get()->shell_delegate()->IsMultiProfilesEnabled())
     return;
 
   // Only regular non-supervised users could add other users to current session.
   if (user_manager::UserManager::Get()->GetActiveUser()->GetType() !=
@@ skipping 237 matching lines @@
 }
 
 void SystemTrayDelegateChromeOS::UpdatePerformanceTracing() {
   if (!user_pref_registrar_)
     return;
   bool value = user_pref_registrar_->prefs()->GetBoolean(
       prefs::kPerformanceTracingEnabled);
   GetSystemTrayNotifier()->NotifyTracingModeChanged(value);
 }
 
-// Overridden from InputMethodManager::Observer.
-void SystemTrayDelegateChromeOS::InputMethodChanged(
-    input_method::InputMethodManager* manager,
-    Profile* /* profile */,
-    bool show_message) {
-  GetSystemTrayNotifier()->NotifyRefreshIME();
-}
-
-// Overridden from InputMethodMenuManager::Observer.
-void SystemTrayDelegateChromeOS::InputMethodMenuItemChanged(
-    ui::ime::InputMethodMenuManager* manager) {
-  GetSystemTrayNotifier()->NotifyRefreshIME();
-}
-
 // Overridden from chrome::BrowserListObserver.
 void SystemTrayDelegateChromeOS::OnBrowserRemoved(Browser* browser) {
   NotifyIfLastWindowClosed();
 }
 
 // Overridden from extensions::AppWindowRegistry::Observer.
 void SystemTrayDelegateChromeOS::OnAppWindowRemoved(
     extensions::AppWindow* app_window) {
   NotifyIfLastWindowClosed();
 }
 
 void SystemTrayDelegateChromeOS::OnAccessibilityStatusChanged(
     const AccessibilityStatusEventDetails& details) {
   if (details.notification_type == ACCESSIBILITY_MANAGER_SHUTDOWN)
     accessibility_subscription_.reset();
   else
     OnAccessibilityModeChanged(details.notify);
 }
 
-void SystemTrayDelegateChromeOS::ImeMenuActivationChanged(bool is_active) {
-  GetSystemTrayNotifier()->NotifyRefreshIMEMenu(is_active);
-}
-
-void SystemTrayDelegateChromeOS::ImeMenuListChanged() {}
-
-void SystemTrayDelegateChromeOS::ImeMenuItemsChanged(
-    const std::string& engine_id,
-    const std::vector<input_method::InputMethodManager::MenuItem>& items) {}
-
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos