diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 22:44:17 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 22:44:17 +0000 |
| commit | c284cca1fe42794e5f4366cc46a66a2287e6677e (patch) | |
| tree | 71983f8eb183993f8f5739c82b7ae3f16c1753af /ash/ime/input_method_menu_manager.h | |
| parent | d03d664a47a3a0ad32c529c231017d8a0e75f439 (diff) | |
| download | chromium_src-c284cca1fe42794e5f4366cc46a66a2287e6677e.zip chromium_src-c284cca1fe42794e5f4366cc46a66a2287e6677e.tar.gz chromium_src-c284cca1fe42794e5f4366cc46a66a2287e6677e.tar.bz2 | |
Revert 251327 "Reland of: Split out InputMethodMenuManager from ..."
> Reland of: Split out InputMethodMenuManager from InputMethodManager.
>
> Rename input_method_property to input_method_menu_item, and move to ash/ime.
>
> This is a reland of https://codereview.chromium.org/150203015,reverted by https://codereview.chromium.org/165453002
>
> Use Singleton<> instead of trying to maintain my own singleton.
>
> BUG=342336, 343044
>
> Review URL: https://codereview.chromium.org/165783002
TBR=uekawa@chromium.org
Review URL: https://codereview.chromium.org/167823002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ime/input_method_menu_manager.h')
| -rw-r--r-- | ash/ime/input_method_menu_manager.h | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/ash/ime/input_method_menu_manager.h b/ash/ime/input_method_menu_manager.h deleted file mode 100644 index ffaeb480..0000000 --- a/ash/ime/input_method_menu_manager.h +++ /dev/null @@ -1,65 +0,0 @@ -// Copyright 2014 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/ash_export.h" - -#include "ash/ime/input_method_menu_item.h" -#include "base/observer_list.h" - -#ifndef ASH_IME_INPUT_METHOD_MENU_MANAGER_H_ -#define ASH_IME_INPUT_METHOD_MENU_MANAGER_H_ - -template<typename Type> struct DefaultSingletonTraits; - -namespace ash { -namespace ime { - -class ASH_EXPORT InputMethodMenuManager { -public: - class Observer { - public: - virtual ~Observer() {} - - // Called when the list of menu items is changed. - virtual void InputMethodMenuItemChanged( - InputMethodMenuManager* manager) = 0; - }; - - ~InputMethodMenuManager(); - - void AddObserver(Observer* observer); - void RemoveObserver(Observer* observer); - - // Obtains the singleton instance. - static InputMethodMenuManager* GetInstance(); - - // Sets the list of input method menu items. The list could be empty(). - void SetCurrentInputMethodMenuItemList( - const InputMethodMenuItemList& menu_list); - - // Gets the list of input method menu items. The list could be empty(). - InputMethodMenuItemList GetCurrentInputMethodMenuItemList() const; - - // True if the key exists in the menu_list_. - bool HasInputMethodMenuItemForKey(const std::string& key) const; - - private: - InputMethodMenuManager(); - - // For Singleton to be able to construct an instance. - friend struct DefaultSingletonTraits<InputMethodMenuManager>; - - // Menu item list of the input method. This is set by extension IMEs. - InputMethodMenuItemList menu_list_; - - // Observers who will be notified when menu changes. - ObserverList<Observer> observers_; - - DISALLOW_COPY_AND_ASSIGN(InputMethodMenuManager); -}; - -} // namespace ime -} // namespace ash - -#endif // ASH_IME_INPUT_METHOD_MENU_MANAGER_H_ |