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

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

Issue 428783008: GetActiveUserProfile() should not be called before profile is initialized. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Cleanup. Created 6 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
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 virtual void EnableLoginLayouts( 58 virtual void EnableLoginLayouts(
59 const std::string& language_code, 59 const std::string& language_code,
60 const std::vector<std::string>& initial_layouts) OVERRIDE; 60 const std::vector<std::string>& initial_layouts) OVERRIDE;
61 virtual bool ReplaceEnabledInputMethods( 61 virtual bool ReplaceEnabledInputMethods(
62 const std::vector<std::string>& new_active_input_method_ids) OVERRIDE; 62 const std::vector<std::string>& new_active_input_method_ids) OVERRIDE;
63 virtual bool EnableInputMethod(const std::string& new_active_input_method_id) 63 virtual bool EnableInputMethod(const std::string& new_active_input_method_id)
64 OVERRIDE; 64 OVERRIDE;
65 virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE; 65 virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE;
66 virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE; 66 virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE;
67 virtual void AddInputMethodExtension( 67 virtual void AddInputMethodExtension(
68 Profile* profile,
68 const std::string& id, 69 const std::string& id,
69 InputMethodEngineInterface* instance) OVERRIDE; 70 InputMethodEngineInterface* instance) OVERRIDE;
70 virtual void RemoveInputMethodExtension(const std::string& id) OVERRIDE; 71 virtual void RemoveInputMethodExtension(Profile* profile,
72 const std::string& id) OVERRIDE;
71 virtual void GetInputMethodExtensions( 73 virtual void GetInputMethodExtensions(
72 InputMethodDescriptors* result) OVERRIDE; 74 InputMethodDescriptors* result) OVERRIDE;
73 virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE; 75 virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE;
74 virtual void SetInputMethodLoginDefault() OVERRIDE; 76 virtual void SetInputMethodLoginDefault() OVERRIDE;
75 virtual void SetInputMethodLoginDefaultFromVPD( 77 virtual void SetInputMethodLoginDefaultFromVPD(
76 const std::string& locale, const std::string& layout) OVERRIDE; 78 const std::string& locale, const std::string& layout) OVERRIDE;
77 virtual bool SwitchToNextInputMethod() OVERRIDE; 79 virtual bool SwitchToNextInputMethod() OVERRIDE;
78 virtual bool SwitchToPreviousInputMethod( 80 virtual bool SwitchToPreviousInputMethod(
79 const ui::Accelerator& accelerator) OVERRIDE; 81 const ui::Accelerator& accelerator) OVERRIDE;
80 virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE; 82 virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;
(...skipping 13 matching lines...) Expand all
94 // Sets |candidate_window_controller_|. 96 // Sets |candidate_window_controller_|.
95 void SetCandidateWindowControllerForTesting( 97 void SetCandidateWindowControllerForTesting(
96 CandidateWindowController* candidate_window_controller); 98 CandidateWindowController* candidate_window_controller);
97 // Sets |keyboard_|. 99 // Sets |keyboard_|.
98 void SetImeKeyboardForTesting(ImeKeyboard* keyboard); 100 void SetImeKeyboardForTesting(ImeKeyboard* keyboard);
99 // Initialize |component_extension_manager_|. 101 // Initialize |component_extension_manager_|.
100 void InitializeComponentExtensionForTesting( 102 void InitializeComponentExtensionForTesting(
101 scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate); 103 scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate);
102 104
103 private: 105 private:
106 friend class InputMethodManagerImplTest;
107
104 // CandidateWindowController::Observer overrides: 108 // CandidateWindowController::Observer overrides:
105 virtual void CandidateClicked(int index) OVERRIDE; 109 virtual void CandidateClicked(int index) OVERRIDE;
106 virtual void CandidateWindowOpened() OVERRIDE; 110 virtual void CandidateWindowOpened() OVERRIDE;
107 virtual void CandidateWindowClosed() OVERRIDE; 111 virtual void CandidateWindowClosed() OVERRIDE;
108 112
109 // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic) 113 // Temporarily deactivates all input methods (e.g. Chinese, Japanese, Arabic)
110 // since they are not necessary to input a login password. Users are still 114 // since they are not necessary to input a login password. Users are still
111 // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak, 115 // able to use/switch active keyboard layouts (e.g. US qwerty, US dvorak,
112 // French). 116 // French).
113 void OnScreenLocked(); 117 void OnScreenLocked();
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 typedef std::map<Profile*, EngineMap, ProfileCompare> ProfileEngineMap; 214 typedef std::map<Profile*, EngineMap, ProfileCompare> ProfileEngineMap;
211 ProfileEngineMap profile_engine_map_; 215 ProfileEngineMap profile_engine_map_;
212 216
213 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl); 217 DISALLOW_COPY_AND_ASSIGN(InputMethodManagerImpl);
214 }; 218 };
215 219
216 } // namespace input_method 220 } // namespace input_method
217 } // namespace chromeos 221 } // namespace chromeos
218 222
219 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_ 223 #endif // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_INPUT_METHOD_MANAGER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698