diff options
| author | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 01:52:10 +0000 |
|---|---|---|
| committer | pauljensen@chromium.org <pauljensen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 01:52:10 +0000 |
| commit | 9840b18e8940895fefa9b8c658e0344965e18627 (patch) | |
| tree | 319c17e7ff3afb5cda33b61eb2c57ba62cb9b2c4 /net/tools | |
| parent | 801730b75fa0ccf2cb0ff60826b6395e9dd0de8c (diff) | |
| download | chromium_src-9840b18e8940895fefa9b8c658e0344965e18627.zip chromium_src-9840b18e8940895fefa9b8c658e0344965e18627.tar.gz chromium_src-9840b18e8940895fefa9b8c658e0344965e18627.tar.bz2 | |
Avoid calling into glib on ChromeOS
Review URL: https://chromiumcodereview.appspot.com/11411078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168690 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -rw-r--r-- | net/tools/net_watcher/net_watcher.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tools/net_watcher/net_watcher.cc b/net/tools/net_watcher/net_watcher.cc index cfe588b..b5aa4e3 100644 --- a/net/tools/net_watcher/net_watcher.cc +++ b/net/tools/net_watcher/net_watcher.cc @@ -21,7 +21,7 @@ #include "net/proxy/proxy_config_service.h" #include "net/proxy/proxy_service.h" -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) #include <glib-object.h> #endif @@ -123,7 +123,7 @@ int main(int argc, char* argv[]) { #if defined(OS_MACOSX) base::mac::ScopedNSAutoreleasePool pool; #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS) // Needed so ProxyConfigServiceLinux can use gconf. // Normally handled by BrowserMainLoop::InitializeToolkit(). g_type_init(); |