Reland r49135: Linux: enable compiling GNOME Keyring and KWallet integration.

chrome/chrome_browser.gypi

 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 1780 matching lines @@
         'browser/password_manager/login_database.cc',
         'browser/password_manager/login_database.h',
         'browser/password_manager/password_form_manager.cc',
         'browser/password_manager/password_form_manager.h',
         'browser/password_manager/password_manager.cc',
         'browser/password_manager/password_manager.h',
         'browser/password_manager/password_store.cc',
         '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',
         'browser/password_manager/password_store_win.h',
         'browser/password_manager/password_store_win.cc',
         'browser/platform_util.h',
         'browser/platform_util_linux.cc',
         'browser/platform_util_chromeos.cc',
         'browser/platform_util_common_linux.cc',
         'browser/platform_util_mac.mm',
@@ skipping 10 matching lines @@
         'browser/power_save_blocker.h',
         'browser/power_save_blocker_common.cc',
         'browser/power_save_blocker_stub.cc',
         'browser/power_save_blocker_win.cc',
         'browser/pref_member.cc',
         'browser/pref_member.h',
         'browser/pref_service.cc',
         'browser/pref_service.h',
         'browser/pref_store.h',
         'browser/pref_value_store.cc',
-        'browser/pref_value_store.h', 
+        'browser/pref_value_store.h',
         'browser/printing/print_dialog_gtk.cc',
         'browser/printing/print_dialog_gtk.h',
         'browser/printing/print_dialog_cloud.cc',
         'browser/printing/print_dialog_cloud.h',
         'browser/printing/print_job.cc',
         'browser/printing/print_job.h',
         'browser/printing/print_job_manager.cc',
         'browser/printing/print_job_manager.h',
         'browser/printing/print_job_worker.cc',
         'browser/printing/print_job_worker.h',
@@ skipping 800 matching lines @@
             'CHROME_V8',
           ],
         }],
         ['chromeos==0', {
           'sources/': [
             ['exclude', '^browser/chromeos'],
           ],
         }],
         ['chromeos==1', {
           'sources!': [
+            '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/platform_util_linux.cc',
           ],
           'link_settings': {
             'libraries': [
               '-lpulse',
             ],
           },
         }],
         ['OS=="linux"', {
           '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:gtk',
             '../build/linux/system.gyp:gtkprint',
             '../build/linux/system.gyp:nss',
           ],
           'link_settings': {
             'libraries': [
               # For dlsym() in 'browser/zygote_main_linux.cc'
               '-ldl',
             ],
           },
@@ skipping 13 matching lines @@
             'third_party/mozilla_security_manager/nsNSSCertHelper.cpp',
             'third_party/mozilla_security_manager/nsNSSCertHelper.h',
             'third_party/mozilla_security_manager/nsNSSCertificate.cpp',
             'third_party/mozilla_security_manager/nsNSSCertificate.h',
             'third_party/mozilla_security_manager/nsNSSCertTrust.cpp',
             'third_party/mozilla_security_manager/nsNSSCertTrust.h',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.cpp',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
           ],
           'conditions': [
+            ['chromeos==0', {
+              'dependencies': [
+                '../build/linux/system.gyp:gnome-keyring',
+              ],
+            }],
             ['linux_breakpad==1', {
               'sources': [
                 'app/breakpad_linux.cc',
                 'app/breakpad_linux.h',
                 'browser/crash_handler_host_linux.cc',
               ],
               'dependencies': [
                 '../breakpad/breakpad.gyp:breakpad_client',
               ],
               'include_dirs': [
@@ skipping 892 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: