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

Unified Diff: content/browser/geolocation/wifi_data_provider_linux.cc

Issue 6648002: Make DBUS an optional dependency so Chromium can be built without it.... Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 9 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // defined(USE_DBUS)
} // 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;
}
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698