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

Side by Side Diff: chrome/browser/chromeos/input_method/input_method_manager_impl.h

Issue 10829065: Remove InputMethodManager::EnableHotkeys() and DisableHotkeys(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 6 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 const std::string& config_name, 49 const std::string& config_name,
50 const InputMethodConfigValue& value) OVERRIDE; 50 const InputMethodConfigValue& value) OVERRIDE;
51 virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE; 51 virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE;
52 virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE; 52 virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE;
53 virtual void AddInputMethodExtension( 53 virtual void AddInputMethodExtension(
54 const std::string& id, 54 const std::string& id,
55 const std::string& name, 55 const std::string& name,
56 const std::vector<std::string>& layouts, 56 const std::vector<std::string>& layouts,
57 const std::string& language) OVERRIDE; 57 const std::string& language) OVERRIDE;
58 virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE; 58 virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE;
59 virtual void EnableHotkeys() OVERRIDE;
60 virtual void DisableHotkeys() OVERRIDE;
61 virtual bool SwitchToNextInputMethod() OVERRIDE; 59 virtual bool SwitchToNextInputMethod() OVERRIDE;
62 virtual bool SwitchToPreviousInputMethod() OVERRIDE; 60 virtual bool SwitchToPreviousInputMethod() OVERRIDE;
63 virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; 61 virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;
64 virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE; 62 virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE;
65 virtual InputMethodPropertyList 63 virtual InputMethodPropertyList
66 GetCurrentInputMethodProperties() const OVERRIDE; 64 GetCurrentInputMethodProperties() const OVERRIDE;
67 virtual XKeyboard* GetXKeyboard() OVERRIDE; 65 virtual XKeyboard* GetXKeyboard() OVERRIDE;
68 virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE; 66 virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE;
69 67
70 // Sets |ibus_controller_|. 68 // Sets |ibus_controller_|.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 // If |current_input_method_id_| is not in |input_method_ids|, switch to 118 // If |current_input_method_id_| is not in |input_method_ids|, switch to
121 // input_method_ids[0]. If the ID is equal to input_method_ids[N], switch to 119 // input_method_ids[0]. If the ID is equal to input_method_ids[N], switch to
122 // input_method_ids[N+1]. 120 // input_method_ids[N+1].
123 void SwitchToNextInputMethodInternal( 121 void SwitchToNextInputMethodInternal(
124 const std::vector<std::string>& input_method_ids, 122 const std::vector<std::string>& input_method_ids,
125 const std::string& current_input_method_id); 123 const std::string& current_input_method_id);
126 124
127 void ChangeInputMethodInternal(const std::string& input_method_id, 125 void ChangeInputMethodInternal(const std::string& input_method_id,
128 bool show_message); 126 bool show_message);
129 127
130 // true when DisableHotkeys() is called to temporarily disable IME hotkeys.
131 // EnableHotkeys() resets the flag to the default value, false.
132 bool ignore_hotkeys_;
133
134 // The current browser status. 128 // The current browser status.
135 State state_; 129 State state_;
136 130
137 // A list of objects that monitor the manager. 131 // A list of objects that monitor the manager.
138 ObserverList<InputMethodManager::Observer> observers_; 132 ObserverList<InputMethodManager::Observer> observers_;
139 ObserverList<CandidateWindowObserver> candidate_window_observers_; 133 ObserverList<CandidateWindowObserver> candidate_window_observers_;
140 134
141 // The input method which was/is selected. 135 // The input method which was/is selected.
142 InputMethodDescriptor previous_input_method_; 136 InputMethodDescriptor previous_input_method_;
143 InputMethodDescriptor current_input_method_; 137 InputMethodDescriptor current_input_method_;
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 // auto-repeat interval. 172 // auto-repeat interval.
179 scoped_ptr<XKeyboard> xkeyboard_; 173 scoped_ptr<XKeyboard> xkeyboard_;
180 174
181 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl); 175 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
182 }; 176 };
183 177
184 } // namespace input_method 178 } // namespace input_method
185 } // namespace chromeos 179 } // namespace chromeos
186 180
187 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 181 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698