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

Unified Diff: chrome/browser/profile_impl.cc

Issue 3380004: Linux: make compile-time dependency on gnome-keyring optional. (Closed)
Patch Set: fixes Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profile_impl.cc
diff --git a/chrome/browser/profile_impl.cc b/chrome/browser/profile_impl.cc
index f97271657a7c39e6ef39dbb8bf9e148dde71f8f8..2a3bb3fd275b6ace9dfeaa9dc86a4d11c0c0fada 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())
« build/linux/system.gyp ('K') | « build/linux/system.gyp ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698