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

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

Issue 139803010: Support comma separated hardware keyboard layout. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/input_method/mock_input_method_manager.h
diff --git a/chrome/browser/chromeos/input_method/mock_input_method_manager.h b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
index 76c50c44f0eca6f5a1034733921835254c272768..7e5d50661c0b8d0bf2352a4ab35131751c3f3c83 100644
--- a/chrome/browser/chromeos/input_method/mock_input_method_manager.h
+++ b/chrome/browser/chromeos/input_method/mock_input_method_manager.h
@@ -36,8 +36,9 @@ class MockInputMethodManager : public InputMethodManager {
virtual size_t GetNumActiveInputMethods() const OVERRIDE;
virtual const InputMethodDescriptor* GetInputMethodFromId(
const std::string& input_method_id) const OVERRIDE;
- virtual void EnableLoginLayouts(const std::string& language_code,
- const std::string& initial_layout) OVERRIDE;
+ virtual void EnableLoginLayouts(
+ const std::string& language_code,
+ const std::vector<std::string>& initial_layout) OVERRIDE;
virtual bool EnableInputMethods(
const std::vector<std::string>& new_active_input_method_ids) OVERRIDE;
virtual bool EnableInputMethod(
@@ -51,7 +52,7 @@ class MockInputMethodManager : public InputMethodManager {
virtual void GetInputMethodExtensions(
InputMethodDescriptors* result) OVERRIDE;
virtual void SetEnabledExtensionImes(std::vector<std::string>* ids) OVERRIDE;
- virtual void SetInputMethodDefault() OVERRIDE;
+ virtual void SetInputMethodLoginDefault() OVERRIDE;
virtual bool SwitchToNextInputMethod() OVERRIDE;
virtual bool SwitchToPreviousInputMethod(
const ui::Accelerator& accelerator) OVERRIDE;
@@ -74,7 +75,7 @@ class MockInputMethodManager : public InputMethodManager {
// Set values that will be provided to the InputMethodUtil.
void set_application_locale(const std::string& value);
- void set_hardware_keyboard_layout(const std::string& value);
+ void set_hardware_keyboard_layout(const std::vector<std::string>& value);
// TODO(yusukes): Add more variables for counting the numbers of the API calls
int add_observer_count_;

Powered by Google App Engine
This is Rietveld 408576698