OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/native_backend_gnome_x.h" | 5 #include "chrome/browser/password_manager/native_backend_gnome_x.h" |
6 | 6 |
7 #include <dlfcn.h> | 7 #include <dlfcn.h> |
8 #include <gnome-keyring.h> | 8 #include <gnome-keyring.h> |
9 | 9 |
10 #include <map> | 10 #include <map> |
11 #include <string> | 11 #include <string> |
12 #include <vector> | 12 #include <vector> |
13 | 13 |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/string_number_conversions.h" | 15 #include "base/string_number_conversions.h" |
16 #include "base/string_piece.h" | 16 #include "base/string_piece.h" |
17 #include "base/string_util.h" | 17 #include "base/string_util.h" |
18 #include "base/stringprintf.h" | 18 #include "base/stringprintf.h" |
19 #include "base/synchronization/waitable_event.h" | 19 #include "base/synchronization/waitable_event.h" |
20 #include "base/time.h" | 20 #include "base/time.h" |
21 #include "base/utf_string_conversions.h" | 21 #include "base/utf_string_conversions.h" |
22 #include "content/public/browser/browser_thread.h" | 22 #include "content/public/browser/browser_thread.h" |
23 | 23 |
| 24 using content::BrowserThread; |
24 using webkit_glue::PasswordForm; | 25 using webkit_glue::PasswordForm; |
25 | 26 |
26 #define GNOME_KEYRING_DEFINE_POINTER(name) \ | 27 #define GNOME_KEYRING_DEFINE_POINTER(name) \ |
27 typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name; | 28 typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name; |
28 GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER) | 29 GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER) |
29 #undef GNOME_KEYRING_DEFINE_POINTER | 30 #undef GNOME_KEYRING_DEFINE_POINTER |
30 | 31 |
31 bool GnomeKeyringLoader::keyring_loaded = false; | 32 bool GnomeKeyringLoader::keyring_loaded = false; |
32 | 33 |
33 #if defined(DLOPEN_GNOME_KEYRING) | 34 #if defined(DLOPEN_GNOME_KEYRING) |
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
727 // Each other profile must be able to migrate the shared data as well, | 728 // Each other profile must be able to migrate the shared data as well, |
728 // so we must leave it alone. After a few releases, we'll add code to | 729 // so we must leave it alone. After a few releases, we'll add code to |
729 // delete them, and eventually remove this migration code. | 730 // delete them, and eventually remove this migration code. |
730 // TODO(mdm): follow through with the plan above. | 731 // TODO(mdm): follow through with the plan above. |
731 PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_); | 732 PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_); |
732 } else { | 733 } else { |
733 // We failed to migrate for some reason. Use the old app string. | 734 // We failed to migrate for some reason. Use the old app string. |
734 app_string_ = kGnomeKeyringAppString; | 735 app_string_ = kGnomeKeyringAppString; |
735 } | 736 } |
736 } | 737 } |
OLD | NEW |