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

Side by Side Diff: chrome/browser/chromeos/preferences.h

Issue 10383301: Move modifier remapping code from X to Ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: style fix Created 8 years, 7 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_PREFERENCES_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
7 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 82
83 // A variant of SetLanguageConfigStringList. You can pass comma-separated 83 // A variant of SetLanguageConfigStringList. You can pass comma-separated
84 // values. Examples of |value|: "", "Control+space,Hiragana" 84 // values. Examples of |value|: "", "Control+space,Hiragana"
85 void SetLanguageConfigStringListAsCSV(const char* section, 85 void SetLanguageConfigStringListAsCSV(const char* section,
86 const char* name, 86 const char* name,
87 const std::string& value); 87 const std::string& value);
88 88
89 // Restores the user's preferred input method / keyboard layout on signing in. 89 // Restores the user's preferred input method / keyboard layout on signing in.
90 void SetInputMethodList(); 90 void SetInputMethodList();
91 91
92 // Updates the mapping of modifier keys following current prefs values.
93 void UpdateModifierKeyMapping();
94
95 // Updates the initial key repeat delay and key repeat interval following 92 // Updates the initial key repeat delay and key repeat interval following
96 // current prefs values. We set the delay and interval at once since an 93 // current prefs values. We set the delay and interval at once since an
97 // underlying XKB API requires it. 94 // underlying XKB API requires it.
98 void UpdateAutoRepeatRate(); 95 void UpdateAutoRepeatRate();
99 96
100 input_method::InputMethodManager* input_method_manager_; 97 input_method::InputMethodManager* input_method_manager_;
101 98
102 BooleanPrefMember tap_to_click_enabled_; 99 BooleanPrefMember tap_to_click_enabled_;
103 BooleanPrefMember three_finger_click_enabled_; 100 BooleanPrefMember three_finger_click_enabled_;
104 BooleanPrefMember natural_scroll_; 101 BooleanPrefMember natural_scroll_;
(...skipping 28 matching lines...) Expand all
133 language_prefs::kNumPinyinBooleanPrefs]; 130 language_prefs::kNumPinyinBooleanPrefs];
134 IntegerPrefMember pinyin_int_prefs_[ 131 IntegerPrefMember pinyin_int_prefs_[
135 language_prefs::kNumPinyinIntegerPrefs]; 132 language_prefs::kNumPinyinIntegerPrefs];
136 IntegerPrefMember pinyin_double_pinyin_schema_; 133 IntegerPrefMember pinyin_double_pinyin_schema_;
137 BooleanPrefMember mozc_boolean_prefs_[ 134 BooleanPrefMember mozc_boolean_prefs_[
138 language_prefs::kNumMozcBooleanPrefs]; 135 language_prefs::kNumMozcBooleanPrefs];
139 StringPrefMember mozc_multiple_choice_prefs_[ 136 StringPrefMember mozc_multiple_choice_prefs_[
140 language_prefs::kNumMozcMultipleChoicePrefs]; 137 language_prefs::kNumMozcMultipleChoicePrefs];
141 IntegerPrefMember mozc_integer_prefs_[ 138 IntegerPrefMember mozc_integer_prefs_[
142 language_prefs::kNumMozcIntegerPrefs]; 139 language_prefs::kNumMozcIntegerPrefs];
143 IntegerPrefMember xkb_remap_search_key_to_;
144 IntegerPrefMember xkb_remap_control_key_to_;
145 IntegerPrefMember xkb_remap_alt_key_to_;
146 BooleanPrefMember xkb_auto_repeat_enabled_; 140 BooleanPrefMember xkb_auto_repeat_enabled_;
147 IntegerPrefMember xkb_auto_repeat_delay_pref_; 141 IntegerPrefMember xkb_auto_repeat_delay_pref_;
148 IntegerPrefMember xkb_auto_repeat_interval_pref_; 142 IntegerPrefMember xkb_auto_repeat_interval_pref_;
149 143
150 BooleanPrefMember enable_screen_lock_; 144 BooleanPrefMember enable_screen_lock_;
151 145
152 BooleanPrefMember enable_drm_; 146 BooleanPrefMember enable_drm_;
153 147
154 DISALLOW_COPY_AND_ASSIGN(Preferences); 148 DISALLOW_COPY_AND_ASSIGN(Preferences);
155 }; 149 };
156 150
157 } // namespace chromeos 151 } // namespace chromeos
158 152
159 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 153 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698