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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // Returns default IME state for user session. 199 // Returns default IME state for user session.
200 scoped_refptr<input_method::InputMethodManager::State> GetDefaultIMEState( 200 scoped_refptr<input_method::InputMethodManager::State> GetDefaultIMEState(
201 Profile* profile); 201 Profile* profile);
202 202
203 // Note this could return NULL if not enabled. 203 // Note this could return NULL if not enabled.
204 EasyUnlockKeyManager* GetEasyUnlockKeyManager(); 204 EasyUnlockKeyManager* GetEasyUnlockKeyManager();
205 205
206 // Update Easy unlock cryptohome keys for given user context. 206 // Update Easy unlock cryptohome keys for given user context.
207 void UpdateEasyUnlockKeys(const UserContext& user_context); 207 void UpdateEasyUnlockKeys(const UserContext& user_context);
208 208
209 // Removes a profile from the per-user input methods states map.
210 void RemoveProfileForTesting(Profile* profile);
211
212 private: 209 private:
213 friend struct DefaultSingletonTraits<UserSessionManager>; 210 friend struct DefaultSingletonTraits<UserSessionManager>;
214 211
215 typedef std::set<std::string> SigninSessionRestoreStateSet; 212 typedef std::set<std::string> SigninSessionRestoreStateSet;
216 213
217 UserSessionManager(); 214 UserSessionManager();
218 virtual ~UserSessionManager(); 215 virtual ~UserSessionManager();
219 216
220 // OAuth2LoginManager::Observer overrides: 217 // OAuth2LoginManager::Observer overrides:
221 virtual void OnSessionRestoreStateChanged( 218 virtual void OnSessionRestoreStateChanged(
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_; 377 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
381 bool running_easy_unlock_key_ops_; 378 bool running_easy_unlock_key_ops_;
382 base::Closure easy_unlock_key_ops_finished_callback_; 379 base::Closure easy_unlock_key_ops_finished_callback_;
383 380
384 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); 381 DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
385 }; 382 };
386 383
387 } // namespace chromeos 384 } // namespace chromeos
388 385
389 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 386 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698