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

Unified Diff: chrome/browser/password_manager/native_backend_gnome_x.cc

Issue 2191873002: Deprecate DLOPEN_GNOME_KEYRING flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed linux_link_gnome_keyring Created 4 years, 5 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/password_manager/native_backend_gnome_x.cc
diff --git a/chrome/browser/password_manager/native_backend_gnome_x.cc b/chrome/browser/password_manager/native_backend_gnome_x.cc
index 5c1118cde6bf84d7cb6bbb57595a69d6659a29a4..6226858f726aa232451b866e1921ffb1d0aa45fe 100644
--- a/chrome/browser/password_manager/native_backend_gnome_x.cc
+++ b/chrome/browser/password_manager/native_backend_gnome_x.cc
@@ -9,6 +9,7 @@
#include <stddef.h>
#include <stdint.h>
+#include <limits>
#include <map>
#include <memory>
#include <string>
@@ -48,8 +49,6 @@ GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_DEFINE_POINTER)
bool GnomeKeyringLoader::keyring_loaded = false;
-#if defined(DLOPEN_GNOME_KEYRING)
-
#define GNOME_KEYRING_FUNCTION_INFO(name) \
{"gnome_keyring_"#name, reinterpret_cast<void**>(&gnome_keyring_##name)},
const GnomeKeyringLoader::FunctionInfo GnomeKeyringLoader::functions[] = {
@@ -89,21 +88,6 @@ bool GnomeKeyringLoader::LoadGnomeKeyring() {
return true;
}
-#else // defined(DLOPEN_GNOME_KEYRING)
-
-bool GnomeKeyringLoader::LoadGnomeKeyring() {
- if (keyring_loaded)
- return true;
-#define GNOME_KEYRING_ASSIGN_POINTER(name) \
- gnome_keyring_##name = &::gnome_keyring_##name;
- GNOME_KEYRING_FOR_EACH_FUNC(GNOME_KEYRING_ASSIGN_POINTER)
-#undef GNOME_KEYRING_ASSIGN_POINTER
- keyring_loaded = true;
- return true;
-}
-
-#endif // defined(DLOPEN_GNOME_KEYRING)
-
namespace {
const char kGnomeKeyringAppString[] = "chrome";

Powered by Google App Engine
This is Rietveld 408576698