summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome_browser.gypi14
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fc19b62..7acde49 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1797,12 +1797,10 @@
'browser/password_manager/password_store.h',
'browser/password_manager/password_store_default.cc',
'browser/password_manager/password_store_default.h',
- # Temporarily disabled while we figure some stuff out.
- # http://code.google.com/p/chromium/issues/detail?id=12351
- # 'browser/password_manager/password_store_gnome.h',
- # 'browser/password_manager/password_store_gnome.cc',
- # 'browser/password_manager/password_store_kwallet.h',
- # 'browser/password_manager/password_store_kwallet.cc',
+ 'browser/password_manager/password_store_gnome.h',
+ 'browser/password_manager/password_store_gnome.cc',
+ 'browser/password_manager/password_store_kwallet.h',
+ 'browser/password_manager/password_store_kwallet.cc',
'browser/password_manager/password_store_mac_internal.h',
'browser/password_manager/password_store_mac.h',
'browser/password_manager/password_store_mac.cc',
@@ -2645,9 +2643,7 @@
'dependencies': [
'../build/linux/system.gyp:dbus-glib',
'../build/linux/system.gyp:gconf',
- # Temporarily disabled while we figure some stuff out.
- # http://code.google.com/p/chromium/issues/detail?id=12351
- # '../build/linux/system.gyp:gnome-keyring',
+ '../build/linux/system.gyp:gnome-keyring',
'../build/linux/system.gyp:gtk',
'../build/linux/system.gyp:gtkprint',
'../build/linux/system.gyp:nss',