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

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

Issue 419293002: IME refactoring: ChromeOS introduce input methods State. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 5 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_PREFERENCES_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 6 #define CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "ash/shell_observer.h" 11 #include "ash/shell_observer.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/prefs/pref_member.h" 13 #include "base/prefs/pref_member.h"
14 #include "chrome/browser/chromeos/language_preferences.h" 14 #include "chrome/browser/chromeos/language_preferences.h"
15 #include "chrome/browser/chromeos/login/users/user_manager.h" 15 #include "chrome/browser/chromeos/login/users/user_manager.h"
16 #include "chrome/browser/prefs/pref_service_syncable_observer.h" 16 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
17 #include "chromeos/ime/input_method_manager.h"
17 18
18 class PrefRegistrySimple; 19 class PrefRegistrySimple;
19 class PrefService; 20 class PrefService;
20 class PrefServiceSyncable; 21 class PrefServiceSyncable;
21 22
22 class TracingManager; 23 class TracingManager;
23 24
24 namespace user_prefs { 25 namespace user_prefs {
25 class PrefRegistrySyncable; 26 class PrefRegistrySyncable;
26 } 27 }
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 99
99 // PrefServiceSyncableObserver implementation. 100 // PrefServiceSyncableObserver implementation.
100 virtual void OnIsSyncingChanged() OVERRIDE; 101 virtual void OnIsSyncingChanged() OVERRIDE;
101 102
102 // Overriden from ash::ShellObserver. 103 // Overriden from ash::ShellObserver.
103 virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; 104 virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
104 105
105 // Overriden form UserManager::UserSessionStateObserver. 106 // Overriden form UserManager::UserSessionStateObserver.
106 virtual void ActiveUserChanged(const User* active_user) OVERRIDE; 107 virtual void ActiveUserChanged(const User* active_user) OVERRIDE;
107 108
109 void ActivateInputMethods(const User* active_user);
110
108 PrefServiceSyncable* prefs_; 111 PrefServiceSyncable* prefs_;
109 112
110 input_method::InputMethodManager* input_method_manager_; 113 input_method::InputMethodManager* input_method_manager_;
111 scoped_ptr<TracingManager> tracing_manager_; 114 scoped_ptr<TracingManager> tracing_manager_;
112 115
113 BooleanPrefMember performance_tracing_enabled_; 116 BooleanPrefMember performance_tracing_enabled_;
114 BooleanPrefMember tap_to_click_enabled_; 117 BooleanPrefMember tap_to_click_enabled_;
115 BooleanPrefMember tap_dragging_enabled_; 118 BooleanPrefMember tap_dragging_enabled_;
116 BooleanPrefMember three_finger_click_enabled_; 119 BooleanPrefMember three_finger_click_enabled_;
117 BooleanPrefMember natural_scroll_; 120 BooleanPrefMember natural_scroll_;
(...skipping 14 matching lines...) Expand all
132 BooleanPrefMember xkb_auto_repeat_enabled_; 135 BooleanPrefMember xkb_auto_repeat_enabled_;
133 IntegerPrefMember xkb_auto_repeat_delay_pref_; 136 IntegerPrefMember xkb_auto_repeat_delay_pref_;
134 IntegerPrefMember xkb_auto_repeat_interval_pref_; 137 IntegerPrefMember xkb_auto_repeat_interval_pref_;
135 138
136 // User owning these preferences. 139 // User owning these preferences.
137 const User* user_; 140 const User* user_;
138 141
139 // Whether user is a primary user. 142 // Whether user is a primary user.
140 bool user_is_primary_; 143 bool user_is_primary_;
141 144
145 // Reconfigure ime_state_ after user becomes active.
146 bool ime_state_outdated_;
147 scoped_refptr<input_method::InputMethodManager::State> ime_state_;
148
142 DISALLOW_COPY_AND_ASSIGN(Preferences); 149 DISALLOW_COPY_AND_ASSIGN(Preferences);
143 }; 150 };
144 151
145 } // namespace chromeos 152 } // namespace chromeos
146 153
147 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 154 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698