| 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_factory.h" | 5 #include "chrome/browser/password_manager/password_store_factory.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/environment.h" | 8 #include "base/environment.h" |
| 9 #include "base/metrics/histogram_macros.h" | 9 #include "base/metrics/histogram_macros.h" |
| 10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 } | 349 } |
| 350 | 350 |
| 351 return new PasswordStoreService(ps); | 351 return new PasswordStoreService(ps); |
| 352 } | 352 } |
| 353 | 353 |
| 354 void PasswordStoreFactory::RegisterProfilePrefs( | 354 void PasswordStoreFactory::RegisterProfilePrefs( |
| 355 user_prefs::PrefRegistrySyncable* registry) { | 355 user_prefs::PrefRegistrySyncable* registry) { |
| 356 #if !defined(OS_CHROMEOS) && defined(USE_X11) | 356 #if !defined(OS_CHROMEOS) && defined(USE_X11) |
| 357 // Notice that the preprocessor conditions above are exactly those that will | 357 // Notice that the preprocessor conditions above are exactly those that will |
| 358 // result in using PasswordStoreX in BuildServiceInstanceFor(). | 358 // result in using PasswordStoreX in BuildServiceInstanceFor(). |
| 359 registry->RegisterIntegerPref( | 359 registry->RegisterIntegerPref(password_manager::prefs::kLocalProfileId, |
| 360 password_manager::prefs::kLocalProfileId, | 360 kInvalidLocalProfileId); |
| 361 kInvalidLocalProfileId, | |
| 362 user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); | |
| 363 #endif | 361 #endif |
| 364 } | 362 } |
| 365 | 363 |
| 366 content::BrowserContext* PasswordStoreFactory::GetBrowserContextToUse( | 364 content::BrowserContext* PasswordStoreFactory::GetBrowserContextToUse( |
| 367 content::BrowserContext* context) const { | 365 content::BrowserContext* context) const { |
| 368 return chrome::GetBrowserContextRedirectedInIncognito(context); | 366 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 369 } | 367 } |
| 370 | 368 |
| 371 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() const { | 369 bool PasswordStoreFactory::ServiceIsNULLWhileTesting() const { |
| 372 return true; | 370 return true; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 431 break; | 429 break; |
| 432 case LIBSECRET: | 430 case LIBSECRET: |
| 433 usage = OTHER_LIBSECRET; | 431 usage = OTHER_LIBSECRET; |
| 434 break; | 432 break; |
| 435 } | 433 } |
| 436 } | 434 } |
| 437 UMA_HISTOGRAM_ENUMERATION("PasswordManager.LinuxBackendStatistics", usage, | 435 UMA_HISTOGRAM_ENUMERATION("PasswordManager.LinuxBackendStatistics", usage, |
| 438 MAX_BACKEND_USAGE_VALUE); | 436 MAX_BACKEND_USAGE_VALUE); |
| 439 } | 437 } |
| 440 #endif | 438 #endif |
| OLD | NEW |