trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.h - Issue 165453002: Revert 251164 "Split out InputMethodMenuManager from InputMethod..."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.h

Issue 165453002: Revert 251164 "Split out InputMethodMenuManager from InputMethod..." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 10 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:

Index: trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.h

===================================================================

--- trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.h (revision 251193)

+++ trunk/src/chrome/browser/chromeos/input_method/mock_input_method_manager.h (working copy)

@@ -43,7 +43,7 @@

virtual bool EnableInputMethod(

const std::string& new_active_input_method_id) OVERRIDE;

virtual void ChangeInputMethod(const std::string& input_method_id) OVERRIDE;

- virtual void ActivateInputMethodMenuItem(const std::string& key) OVERRIDE;

+ virtual void ActivateInputMethodProperty(const std::string& key) OVERRIDE;

virtual void AddInputMethodExtension(

const std::string& id,

InputMethodEngineInterface* instance) OVERRIDE;

@@ -57,6 +57,10 @@

const ui::Accelerator& accelerator) OVERRIDE;

virtual bool SwitchInputMethod(const ui::Accelerator& accelerator) OVERRIDE;

virtual InputMethodDescriptor GetCurrentInputMethod() const OVERRIDE;

+ virtual InputMethodPropertyList

+ GetCurrentInputMethodProperties() const OVERRIDE;

+ virtual void SetCurrentInputMethodProperties(

+ const InputMethodPropertyList& property_list) OVERRIDE;

virtual XKeyboard* GetXKeyboard() OVERRIDE;

virtual InputMethodUtil* GetInputMethodUtil() OVERRIDE;

virtual ComponentExtensionIMEManager*