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

Side by Side Diff: chrome/browser/chromeos/login/session/user_session_manager.h

Issue 653723004: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 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 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 std::string* chrome_client_secret); 140 std::string* chrome_client_secret);
141 void SetAppModeChromeClientOAuthInfo( 141 void SetAppModeChromeClientOAuthInfo(
142 const std::string& chrome_client_id, 142 const std::string& chrome_client_id,
143 const std::string& chrome_client_secret); 143 const std::string& chrome_client_secret);
144 144
145 // Changes browser locale (selects best suitable locale from different 145 // Changes browser locale (selects best suitable locale from different
146 // user settings). Returns true if callback will be called. 146 // user settings). Returns true if callback will be called.
147 bool RespectLocalePreference( 147 bool RespectLocalePreference(
148 Profile* profile, 148 Profile* profile,
149 const user_manager::User* user, 149 const user_manager::User* user,
150 const locale_util::SwitchLanguageCallback& callback) const; 150 scoped_ptr<locale_util::SwitchLanguageCallback> callback) const;
151 151
152 // Returns true if Easy unlock keys needs to be updated. 152 // Returns true if Easy unlock keys needs to be updated.
153 bool NeedsToUpdateEasyUnlockKeys() const; 153 bool NeedsToUpdateEasyUnlockKeys() const;
154 154
155 // Returns true if there are pending Easy unlock key operations and 155 // Returns true if there are pending Easy unlock key operations and
156 // |callback| will be invoked when it is done. 156 // |callback| will be invoked when it is done.
157 bool CheckEasyUnlockKeyOps(const base::Closure& callback); 157 bool CheckEasyUnlockKeyOps(const base::Closure& callback);
158 158
159 void AddSessionStateObserver(chromeos::UserSessionStateObserver* observer); 159 void AddSessionStateObserver(chromeos::UserSessionStateObserver* observer);
160 void RemoveSessionStateObserver(chromeos::UserSessionStateObserver* observer); 160 void RemoveSessionStateObserver(chromeos::UserSessionStateObserver* observer);
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_; 312 scoped_ptr<EasyUnlockKeyManager> easy_unlock_key_manager_;
313 bool running_easy_unlock_key_ops_; 313 bool running_easy_unlock_key_ops_;
314 base::Closure easy_unlock_key_ops_finished_callback_; 314 base::Closure easy_unlock_key_ops_finished_callback_;
315 315
316 DISALLOW_COPY_AND_ASSIGN(UserSessionManager); 316 DISALLOW_COPY_AND_ASSIGN(UserSessionManager);
317 }; 317 };
318 318
319 } // namespace chromeos 319 } // namespace chromeos
320 320
321 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_ 321 #endif // CHROME_BROWSER_CHROMEOS_LOGIN_SESSION_USER_SESSION_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698