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

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: Update after review. Created 6 years, 4 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 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 // PrefServiceSyncableObserver implementation. 101 // PrefServiceSyncableObserver implementation.
101 virtual void OnIsSyncingChanged() OVERRIDE; 102 virtual void OnIsSyncingChanged() OVERRIDE;
102 103
103 // Overriden from ash::ShellObserver. 104 // Overriden from ash::ShellObserver.
104 virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE; 105 virtual void OnTouchHudProjectionToggled(bool enabled) OVERRIDE;
105 106
106 // Overriden form UserManager::UserSessionStateObserver. 107 // Overriden form UserManager::UserSessionStateObserver.
107 virtual void ActiveUserChanged( 108 virtual void ActiveUserChanged(
108 const user_manager::User* active_user) OVERRIDE; 109 const user_manager::User* active_user) OVERRIDE;
109 110
111 void ActivateInputMethods(const user_manager::User* active_user);
112
110 PrefServiceSyncable* prefs_; 113 PrefServiceSyncable* prefs_;
111 114
112 input_method::InputMethodManager* input_method_manager_; 115 input_method::InputMethodManager* input_method_manager_;
113 scoped_ptr<TracingManager> tracing_manager_; 116 scoped_ptr<TracingManager> tracing_manager_;
114 117
115 BooleanPrefMember performance_tracing_enabled_; 118 BooleanPrefMember performance_tracing_enabled_;
116 BooleanPrefMember tap_to_click_enabled_; 119 BooleanPrefMember tap_to_click_enabled_;
117 BooleanPrefMember tap_dragging_enabled_; 120 BooleanPrefMember tap_dragging_enabled_;
118 BooleanPrefMember three_finger_click_enabled_; 121 BooleanPrefMember three_finger_click_enabled_;
119 BooleanPrefMember natural_scroll_; 122 BooleanPrefMember natural_scroll_;
(...skipping 14 matching lines...) Expand all
134 BooleanPrefMember xkb_auto_repeat_enabled_; 137 BooleanPrefMember xkb_auto_repeat_enabled_;
135 IntegerPrefMember xkb_auto_repeat_delay_pref_; 138 IntegerPrefMember xkb_auto_repeat_delay_pref_;
136 IntegerPrefMember xkb_auto_repeat_interval_pref_; 139 IntegerPrefMember xkb_auto_repeat_interval_pref_;
137 140
138 // User owning these preferences. 141 // User owning these preferences.
139 const user_manager::User* user_; 142 const user_manager::User* user_;
140 143
141 // Whether user is a primary user. 144 // Whether user is a primary user.
142 bool user_is_primary_; 145 bool user_is_primary_;
143 146
147 // Reconfigure ime_state_ after user becomes active.
148 bool ime_state_outdated_;
149 scoped_refptr<input_method::InputMethodManager::State> ime_state_;
150
144 DISALLOW_COPY_AND_ASSIGN(Preferences); 151 DISALLOW_COPY_AND_ASSIGN(Preferences);
145 }; 152 };
146 153
147 } // namespace chromeos 154 } // namespace chromeos
148 155
149 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 156 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698