diff options
| author | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 19:22:15 +0000 |
|---|---|---|
| committer | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-19 19:22:15 +0000 |
| commit | a6f8cb73534952d34e66001f09443e6955b7302b (patch) | |
| tree | cc3d93b62d5b37e32bb59c815330da834114bd34 /net | |
| parent | e2cabc5d57067ff3ccc11b3f8360cfbd142d0777 (diff) | |
| download | chromium_src-a6f8cb73534952d34e66001f09443e6955b7302b.zip chromium_src-a6f8cb73534952d34e66001f09443e6955b7302b.tar.gz chromium_src-a6f8cb73534952d34e66001f09443e6955b7302b.tar.bz2 | |
Get net_watcher working on Gnome
Review URL: https://chromiumcodereview.appspot.com/11308069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168565 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 9 | ||||
| -rw-r--r-- | net/tools/net_watcher/net_watcher.cc | 9 |
2 files changed, 18 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index 70cac5f..b5ccff3 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -2076,6 +2076,15 @@ 'net', 'net_with_v8', ], + 'conditions': [ + [ 'use_glib == 1', { + 'dependencies': [ + '../build/linux/system.gyp:gconf', + '../build/linux/system.gyp:gio', + ], + }, + ], + ], 'sources': [ 'tools/net_watcher/net_watcher.cc', ], diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index f756e97..cfe588b 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -21,6 +21,10 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_service.h" +#if defined(OS_LINUX) || defined(OS_OPENBSD) +#include <glib-object.h> +#endif + #if defined(OS_MACOSX) #include "base/mac/scoped_nsautorelease_pool.h" #endif @@ -119,6 +123,11 @@ int main(int argc, char* argv[]) { #if defined(OS_MACOSX) base::mac::ScopedNSAutoreleasePool pool; #endif +#if defined(OS_LINUX) || defined(OS_OPENBSD) + // Needed so ProxyConfigServiceLinux can use gconf. + // Normally handled by BrowserMainLoop::InitializeToolkit(). + g_type_init(); +#endif base::AtExitManager exit_manager; CommandLine::Init(argc, argv); logging::InitLogging( |