summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile_impl.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 00:22:21 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-16 00:22:21 +0000
commit63692215e10b693db53a395a9fdefd77cf3a6fc6 (patch)
tree5def9ef1dd75c3924f351c760ad9fa8e98065770 /chrome/browser/profile_impl.cc
parent86f56f6d510c533fe570fb6153b6c1f7b4b365a3 (diff)
downloadchromium_src-63692215e10b693db53a395a9fdefd77cf3a6fc6.zip
chromium_src-63692215e10b693db53a395a9fdefd77cf3a6fc6.tar.gz
chromium_src-63692215e10b693db53a395a9fdefd77cf3a6fc6.tar.bz2
Linux: make compile-time dependency on gnome-keyring optional.
This is upstreaming a Gentoo Linux patch. BUG=none TEST=none Review URL: http://codereview.chromium.org/3380004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile_impl.cc')
-rw-r--r--chrome/browser/profile_impl.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index f972716..2a3bb3f 100644
--- a/chrome/browser/profile_impl.cc
+++ b/chrome/browser/profile_impl.cc
@@ -93,7 +93,9 @@
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
#elif defined(OS_POSIX) && !defined(OS_CHROMEOS)
#include "base/xdg_util.h"
+#if defined(USE_GNOME_KEYRING)
#include "chrome/browser/password_manager/native_backend_gnome_x.h"
+#endif
#include "chrome/browser/password_manager/native_backend_kwallet_x.h"
#include "chrome/browser/password_manager/password_store_x.h"
#endif
@@ -965,12 +967,14 @@ void ProfileImpl::CreatePasswordStore() {
backend.reset();
} else if (desktop_env == base::DESKTOP_ENVIRONMENT_GNOME ||
desktop_env == base::DESKTOP_ENVIRONMENT_XFCE) {
+#if defined(USE_GNOME_KEYRING)
LOG(INFO) << "Trying GNOME keyring for password storage.";
backend.reset(new NativeBackendGnome());
if (backend->Init())
LOG(INFO) << "Using GNOME keyring for password storage.";
else
backend.reset();
+#endif // defined(USE_GNOME_KEYRING)
}
// TODO(mdm): this can change to a WARNING when we detect by default.
if (!backend.get())