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

Unified Diff: chrome/browser/sync/util/user_settings.cc

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/sync/util/user_settings.h ('k') | chrome/browser/tab_contents/thumbnail_generator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/util/user_settings.cc
diff --git a/chrome/browser/sync/util/user_settings.cc b/chrome/browser/sync/util/user_settings.cc
index 9f520886e9527e493abb5be602eb9284e5d05b4f..d49a071050f9806c18863b9cee38a64552479c92 100644
--- a/chrome/browser/sync/util/user_settings.cc
+++ b/chrome/browser/sync/util/user_settings.cc
@@ -79,7 +79,7 @@ UserSettings::UserSettings() : dbhandle_(NULL) {
}
string UserSettings::email() const {
- AutoLock lock(mutex_);
+ base::AutoLock lock(mutex_);
return email_;
}
@@ -421,7 +421,7 @@ bool UserSettings::VerifyAgainstStoredHash(const string& email,
void UserSettings::SwitchUser(const string& username) {
{
- AutoLock lock(mutex_);
+ base::AutoLock lock(mutex_);
email_ = username;
}
}
« no previous file with comments | « chrome/browser/sync/util/user_settings.h ('k') | chrome/browser/tab_contents/thumbnail_generator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698