Revert of chromeos: Remove some IME methods from ash::SystemTrayDelegate

ash/accelerators/accelerator_controller.h

 // 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.
 
 #ifndef ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 #define ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 15 matching lines @@
 namespace ui {
 class AcceleratorManager;
 class AcceleratorManagerDelegate;
 }
 
 namespace ash {
 
 struct AcceleratorData;
 class AcceleratorControllerDelegate;
 class ExitWarningHandler;
+class ImeControlDelegate;
 
 // AcceleratorController provides functions for registering or unregistering
 // global keyboard accelerators, which are handled earlier than any windows. It
 // also implements several handlers as an accelerator target.
 class ASH_EXPORT AcceleratorController
     : public ui::AcceleratorTarget,
       NON_EXPORTED_BASE(public mojom::AcceleratorController) {
  public:
   AcceleratorController(AcceleratorControllerDelegate* delegate,
                         ui::AcceleratorManagerDelegate* manager_delegate);
@@ skipping 54 matching lines @@
   // can be consumed by web contents if needed.
   bool IsDeprecated(const ui::Accelerator& accelerator) const;
 
   // Performs the specified action if it is enabled. Returns whether the action
   // was performed successfully.
   bool PerformActionIfEnabled(AcceleratorAction action);
 
   // Returns the restriction for the current context.
   AcceleratorProcessingRestriction GetCurrentAcceleratorRestriction();
 
+  void SetImeControlDelegate(
+      std::unique_ptr<ImeControlDelegate> ime_control_delegate);
+
   // Provides access to the ExitWarningHandler for testing.
   ExitWarningHandler* GetExitWarningHandlerForTest() {
     return &exit_warning_handler_;
   }
 
   // Returns true if the menu should close in order to perform the accelerator.
   bool ShouldCloseMenuAndRepostAccelerator(
       const ui::Accelerator& accelerator) const;
 
   ui::AcceleratorHistory* accelerator_history() {
@@ skipping 56 matching lines @@
       AcceleratorAction action,
       const ui::Accelerator& accelerator) const;
 
   AcceleratorControllerDelegate* delegate_;
 
   std::unique_ptr<ui::AcceleratorManager> accelerator_manager_;
 
   // A tracker for the current and previous accelerators.
   std::unique_ptr<ui::AcceleratorHistory> accelerator_history_;
 
+  std::unique_ptr<ImeControlDelegate> ime_control_delegate_;
+
   // Handles the exit accelerator which requires a double press to exit and
   // shows a popup with an explanation.
   ExitWarningHandler exit_warning_handler_;
 
   // A map from accelerators to the AcceleratorAction values, which are used in
   // the implementation.
   std::map<ui::Accelerator, AcceleratorAction> accelerators_;
 
   std::map<AcceleratorAction, const DeprecatedAcceleratorData*>
       actions_with_deprecations_;
@@ skipping 26 matching lines @@
   std::set<int> actions_needing_window_;
   // Actions that can be performed without closing the menu (if one is present).
   std::set<int> actions_keeping_menu_open_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorController);
 };
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_CONTROLLER_H_