| OLD | NEW |
| 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 #include "chrome/browser/password_manager/password_store_x.h" | 5 #include "chrome/browser/password_manager/password_store_x.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <map> | 8 #include <map> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 264 DeleteAndRecreateDatabaseFile(); | 264 DeleteAndRecreateDatabaseFile(); |
| 265 } | 265 } |
| 266 } | 266 } |
| 267 ssize_t result = ok ? forms.size() : -1; | 267 ssize_t result = ok ? forms.size() : -1; |
| 268 STLDeleteElements(&forms); | 268 STLDeleteElements(&forms); |
| 269 return result; | 269 return result; |
| 270 } | 270 } |
| 271 | 271 |
| 272 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX) | 272 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX) |
| 273 // static | 273 // static |
| 274 void PasswordStoreX::RegisterUserPrefs( | 274 void PasswordStoreX::RegisterProfilePrefs( |
| 275 user_prefs::PrefRegistrySyncable* registry) { | 275 user_prefs::PrefRegistrySyncable* registry) { |
| 276 // Normally we should be on the UI thread here, but in tests we might not. | 276 // Normally we should be on the UI thread here, but in tests we might not. |
| 277 registry->RegisterBooleanPref( | 277 registry->RegisterBooleanPref( |
| 278 prefs::kPasswordsUseLocalProfileId, | 278 prefs::kPasswordsUseLocalProfileId, |
| 279 // default: passwords don't use local ids | 279 // default: passwords don't use local ids |
| 280 false, | 280 false, |
| 281 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | 281 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); |
| 282 } | 282 } |
| 283 | 283 |
| 284 // static | 284 // static |
| (...skipping 15 matching lines...) Expand all Loading... |
| 300 } // anonymous namespace | 300 } // anonymous namespace |
| 301 | 301 |
| 302 // static | 302 // static |
| 303 void PasswordStoreX::SetPasswordsUseLocalProfileId(PrefService* prefs) { | 303 void PasswordStoreX::SetPasswordsUseLocalProfileId(PrefService* prefs) { |
| 304 // This method should work on any thread, but we expect the DB thread. | 304 // This method should work on any thread, but we expect the DB thread. |
| 305 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); | 305 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); |
| 306 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 306 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 307 base::Bind(&UISetPasswordsUseLocalProfileId, prefs)); | 307 base::Bind(&UISetPasswordsUseLocalProfileId, prefs)); |
| 308 } | 308 } |
| 309 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX) | 309 #endif // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX) |
| OLD | NEW |