Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(701)

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.h

Issue 1523593002: Add an option in language settings for activating the IME menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/input_method_manager_impl.h
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index 8860afc42c4156180172b3bf4fc5af03a76715c9..174bbd771d2d0e99527aefe5378eece45824775b 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -150,9 +150,13 @@ class InputMethodManagerImpl : public InputMethodManager,
void AddObserver(InputMethodManager::Observer* observer) override;
void AddCandidateWindowObserver(
InputMethodManager::CandidateWindowObserver* observer) override;
+ void AddImeMenuObserver(
+ InputMethodManager::ImeMenuObserver* observer) override;
void RemoveObserver(InputMethodManager::Observer* observer) override;
void RemoveCandidateWindowObserver(
InputMethodManager::CandidateWindowObserver* observer) override;
+ void RemoveImeMenuObserver(
+ InputMethodManager::ImeMenuObserver* observer) override;
scoped_ptr<InputMethodDescriptors> GetSupportedInputMethods() const override;
void ActivateInputMethodMenuItem(const std::string& key) override;
bool IsISOLevel5ShiftUsedByCurrentInputMethod() const override;
@@ -171,6 +175,9 @@ class InputMethodManagerImpl : public InputMethodManager,
scoped_refptr<InputMethodManager::State> GetActiveIMEState() override;
void SetState(scoped_refptr<InputMethodManager::State> state) override;
+ void ImeMenuActivated() override;
+ void ImeMenuDeactivated() override;
+
// Sets |candidate_window_controller_|.
void SetCandidateWindowControllerForTesting(
CandidateWindowController* candidate_window_controller);
@@ -237,6 +244,7 @@ class InputMethodManagerImpl : public InputMethodManager,
// A list of objects that monitor the manager.
base::ObserverList<InputMethodManager::Observer> observers_;
base::ObserverList<CandidateWindowObserver> candidate_window_observers_;
+ base::ObserverList<ImeMenuObserver> ime_menu_observers_;
scoped_refptr<StateImpl> state_;

Powered by Google App Engine
This is Rietveld 408576698