Linux: make compile-time dependency on gnome-keyring optional.

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 3166 matching lines @@
             'browser/password_manager/native_backend_kwallet_x.h',
             'browser/password_manager/native_backend_kwallet_x.cc',
             'browser/platform_util_linux.cc',
           ],
           'link_settings': {
             'libraries': [
               '-lpulse',
             ],
           },
         }],
+        ['use_gnome_keyring==0', {
+          'sources!': [
+            'browser/password_manager/native_backend_gnome_x.h',
+            'browser/password_manager/native_backend_gnome_x.cc',
+          ],
+        }],
         ['touchui==0', {
           'sources!': [
             # Nothing yet.
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:dbus-glib',
             '../build/linux/system.gyp:gconf',
             '../build/linux/system.gyp:gtk',
@@ skipping 14 matching lines @@
             'browser/crash_handler_host_linux.h',
             'browser/net/ssl_config_service_manager_pref.cc',
             '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/nsUsageArrayHelper.cpp',
             'third_party/mozilla_security_manager/nsUsageArrayHelper.h',
           ],
           'conditions': [
-            ['chromeos==0', {
+            ['use_gnome_keyring==1', {
               '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',
               ],
@@ skipping 767 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: