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

Side by Side Diff: chrome/browser/password_manager/native_backend_gnome_x.cc

Issue 11000016: Move forms/ out of webkit/. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Response to review Created 8 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 (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/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 content::BrowserThread;
25 using webkit::forms::PasswordForm; 25 using content::PasswordForm;
26 26
27 #define GNOME_KEYRING_DEFINE_POINTER(name) \ 27 #define GNOME_KEYRING_DEFINE_POINTER(name) \
28 typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name; 28 typeof(&::gnome_keyring_##name) GnomeKeyringLoader::gnome_keyring_##name;
29 GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER) 29 GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER)
30 #undef GNOME_KEYRING_DEFINE_POINTER 30 #undef GNOME_KEYRING_DEFINE_POINTER
31 31
32 bool GnomeKeyringLoader::keyring_loaded = false; 32 bool GnomeKeyringLoader::keyring_loaded = false;
33 33
34 #if defined(DLOPEN_GNOME_KEYRING) 34 #if defined(DLOPEN_GNOME_KEYRING)
35 35
(...skipping 695 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 // Each other profile must be able to migrate the shared data as well, 731 // Each other profile must be able to migrate the shared data as well,
732 // so we must leave it alone. After a few releases, we'll add code to 732 // so we must leave it alone. After a few releases, we'll add code to
733 // delete them, and eventually remove this migration code. 733 // delete them, and eventually remove this migration code.
734 // TODO(mdm): follow through with the plan above. 734 // TODO(mdm): follow through with the plan above.
735 PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_); 735 PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_);
736 } else { 736 } else {
737 // We failed to migrate for some reason. Use the old app string. 737 // We failed to migrate for some reason. Use the old app string.
738 app_string_ = kGnomeKeyringAppString; 738 app_string_ = kGnomeKeyringAppString;
739 } 739 }
740 } 740 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698