Make DBUS an optional dependency so Chromium can be built without it....

content/browser/geolocation/wifi_data_provider_linux.cc

Index: content/browser/geolocation/wifi_data_provider_linux.cc
===================================================================
--- content/browser/geolocation/wifi_data_provider_linux.cc	(revision 77292)
+++ content/browser/geolocation/wifi_data_provider_linux.cc	(working copy)
@@ -32,6 +32,7 @@
 // From http://projects.gnome.org/NetworkManager/developers/spec.html
 enum { NM_DEVICE_TYPE_WIFI = 2 };
 
+#if defined(USE_DBUS)
 // Function type matching dbus_g_bus_get_private so that we can
 // dynamically determine the presence of this symbol (see
 // NetworkManagerWlanApi::Init)
@@ -396,6 +397,7 @@
   }
   return true;
 }
+#endif

[Paweł Hajdan Jr., 2011/03/08 21:13:13]

nit: Add // defined(USE_DBUS)

There should be two spaces between #endif and the beginning of the comment.

 
 }  // namespace
 
@@ -413,9 +415,11 @@
 
 WifiDataProviderCommon::WlanApiInterface*
 WifiDataProviderLinux::NewWlanApi() {
+#if defined(USE_DBUS)
   scoped_ptr<NetworkManagerWlanApi> wlan_api(new NetworkManagerWlanApi);
   if (wlan_api->Init())
     return wlan_api.release();
+#endif
   return NULL;
 }