summaryrefslogtreecommitdiffstats
path: root/chrome/browser/webdata
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 17:47:35 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-09 17:47:35 +0000
commit109ca1cf9b29865a0f99dc99f379784dc980ac46 (patch)
tree4c16d6b37502c63e06a39cebe065b48c26ced764 /chrome/browser/webdata
parent15a9b5d62a88c344af81ca28a393dc5c954162c6 (diff)
downloadchromium_src-109ca1cf9b29865a0f99dc99f379784dc980ac46.zip
chromium_src-109ca1cf9b29865a0f99dc99f379784dc980ac46.tar.gz
chromium_src-109ca1cf9b29865a0f99dc99f379784dc980ac46.tar.bz2
Add dummy encryptor implementations for mac and linux.
Review URL: http://codereview.chromium.org/43095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata')
-rw-r--r--chrome/browser/webdata/web_database.cc17
1 files changed, 4 insertions, 13 deletions
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index fe9fb5f..9497885 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -12,26 +12,17 @@
#include "base/gfx/png_encoder.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "base/values.h"
#include "chrome/browser/history/history_database.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/common/l10n_util.h"
-#include "chrome/common/scoped_vector.h"
#include "webkit/glue/password_form.h"
-#if defined(OS_POSIX)
-// TODO(port): get rid of this include. It's used just to provide declarations
-// and stub definitions for classes we encouter during the porting effort.
-#include "chrome/common/temp_scaffolding_stubs.h"
-#endif
-
-// TODO(port): Get rid of this section and finish porting.
-#if defined(OS_WIN)
// Encryptor is the *wrong* way of doing things; we need to turn it into a
-// bottleneck to use the platform methods (e.g. Keychain on the Mac). That's
-// going to take a massive change in its API...
+// bottleneck to use the platform methods (e.g. Keychain on the Mac, Gnome
+// Keyring / KWallet on Linux). That's going to take a massive change in its
+// API... see:
+// http://code.google.com/p/chromium/issues/detail?id=8205 (Linux)
#include "chrome/browser/password_manager/encryptor.h"
-#endif
////////////////////////////////////////////////////////////////////////////////
//