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

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

Issue 756363003: Revert of Sync starting language and input method preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years 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 7
8 #include <string> 8 #include <string>
9 #include <vector>
9 10
10 #include "ash/shell_observer.h" 11 #include "ash/shell_observer.h"
11 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
12 #include "base/prefs/pref_member.h" 13 #include "base/prefs/pref_member.h"
13 #include "chrome/browser/chromeos/language_preferences.h" 14 #include "chrome/browser/chromeos/language_preferences.h"
14 #include "chrome/browser/prefs/pref_service_syncable_observer.h" 15 #include "chrome/browser/prefs/pref_service_syncable_observer.h"
15 #include "components/user_manager/user_manager.h" 16 #include "components/user_manager/user_manager.h"
16 #include "ui/base/ime/chromeos/input_method_manager.h" 17 #include "ui/base/ime/chromeos/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 }
27 28
28 namespace chromeos { 29 namespace chromeos {
29 30
30 class User; 31 class User;
31 32
32 namespace input_method { 33 namespace input_method {
33 class InputMethodManager; 34 class InputMethodManager;
34 class InputMethodSyncer;
35 } 35 }
36 36
37 // The Preferences class handles Chrome OS preferences. When the class 37 // The Preferences class handles Chrome OS preferences. When the class
38 // is first initialized, it will initialize the OS settings to what's stored in 38 // is first initialized, it will initialize the OS settings to what's stored in
39 // the preferences. These include touchpad settings, etc. 39 // the preferences. These include touchpad settings, etc.
40 // When the preferences change, we change the settings to reflect the new value. 40 // When the preferences change, we change the settings to reflect the new value.
41 class Preferences : public PrefServiceSyncableObserver, 41 class Preferences : public PrefServiceSyncableObserver,
42 public ash::ShellObserver, 42 public ash::ShellObserver,
43 public user_manager::UserManager::UserSessionStateObserver { 43 public user_manager::UserManager::UserSessionStateObserver {
44 public: 44 public:
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 // User owning these preferences. 145 // User owning these preferences.
146 const user_manager::User* user_; 146 const user_manager::User* user_;
147 147
148 // Whether user is a primary user. 148 // Whether user is a primary user.
149 bool user_is_primary_; 149 bool user_is_primary_;
150 150
151 // Input Methods state for this user. 151 // Input Methods state for this user.
152 scoped_refptr<input_method::InputMethodManager::State> ime_state_; 152 scoped_refptr<input_method::InputMethodManager::State> ime_state_;
153 153
154 scoped_ptr<input_method::InputMethodSyncer> input_method_syncer_;
155
156 DISALLOW_COPY_AND_ASSIGN(Preferences); 154 DISALLOW_COPY_AND_ASSIGN(Preferences);
157 }; 155 };
158 156
159 } // namespace chromeos 157 } // namespace chromeos
160 158
161 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_ 159 #endif // CHROME_BROWSER_CHROMEOS_PREFERENCES_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/users/fake_user_manager.cc ('k') | chrome/browser/chromeos/preferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698