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

Unified Diff: chrome/browser/browser_main.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 | « build/linux/system.gyp ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_main.cc
===================================================================
--- chrome/browser/browser_main.cc (revision 77292)
+++ chrome/browser/browser_main.cc (working copy)
@@ -118,7 +118,9 @@
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#if defined(USE_DBUS)
#include <dbus/dbus-glib.h>
+#endif
#include "chrome/browser/browser_main_gtk.h"
#include "chrome/browser/ui/gtk/gtk_util.h"
#endif
@@ -926,10 +928,14 @@
// definitely harmless, so retained as a reminder of this
// requirement for gconf.
g_type_init();
+
+#if defined(USE_DBUS)
// We use glib-dbus for geolocation and it's possible other libraries
// (e.g. gnome-keyring) will use it, so initialize its threading here
// as well.
dbus_g_thread_init();
+#endif
+
gfx::GtkInitFromCommandLine(parameters.command_line_);
SetUpGLibLogHandler();
#endif
« no previous file with comments | « build/linux/system.gyp ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698