Adding 2 preferences for configuring "NextEngine" and "Trigger" hot-keys.

This change also disables the latter hot-key so that users can't disable IBus. This is preferable since "current input method is xkb:us::eng (for example) and it is enabled" and "current one is xkb:us::eng but it's disabled" are almost indistinguishable.

This change depends on http://codereview.chromium.org/1528023 and http://codereview.chromium.org/1610013.

BUG=none
TEST=boot chrome os, activate English and Chinese, click omnibox, press lang menu, press English to enable "xkb:us::eng", press omnibox, press ctrl+space, verify that the menu shows "Chi" (not "Eng").

Review URL: http://codereview.chromium.org/1553018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44072 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 15 insertions, 1 deletions

diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index d324e09..42a0090 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
 
 #include <string>
+#include <vector>
 
 #include "chrome/browser/pref_member.h"
 #include "chrome/common/notification_observer.h"
@@ -49,12 +50,23 @@ class Preferences : public NotificationObserver {
                                 const char* name,
                                 bool value);
 
-  // Writes stromg |value| to the IME (IBus) configuration daemon. |section|
+  // Writes string |value| to the IME (IBus) configuration daemon. |section|
   // and |name| should not be NULL.
   void SetLanguageConfigString(const char* section,
                                const char* name,
                                const std::wstring& value);
 
+  // Writes a string list to the IME (IBus) configuration daemon. |section|
+  // and |name| should not be NULL.
+  void SetLanguageConfigStringList(const char* section,
+                                   const char* name,
+                                   const std::vector<std::wstring>& values);
+
+  // Set input method hot-keys specified by |name| to |value|.
+  // Examples of |name|: "trigger", "next_engine"
+  // Examples of |value|: "" (no hot-keys), "Control+space,Hiragana"
+  void SetHotkeys(const char* name, const std::wstring& value);
+
   // Activates IMEs that are on |value|, which is a comma separated list of IME
   // IDs (e.g. "xkb:en,pinyin,hangul,m17n:ar:kbd"), and deactivates all other
   // IMEs that are currently active. |value| could be empty. In that case, this
@@ -68,6 +80,8 @@ class Preferences : public NotificationObserver {
   IntegerPrefMember sensitivity_;
   // Language (IME) preferences.
   BooleanPrefMember language_use_global_engine_;
+  StringPrefMember language_hotkey_next_engine_;
+  StringPrefMember language_hotkey_trigger_;
   StringPrefMember language_preload_engines_;
   StringPrefMember language_hangul_keyboard_;