| Index: net/tools/net_watcher/net_watcher.cc
|
| ===================================================================
|
| --- net/tools/net_watcher/net_watcher.cc (revision 274423)
|
| +++ net/tools/net_watcher/net_watcher.cc (working copy)
|
| @@ -21,7 +21,7 @@
|
| #include "net/proxy/proxy_config_service.h"
|
| #include "net/proxy/proxy_service.h"
|
|
|
| -#if defined(USE_GLIB)
|
| +#if defined(USE_GLIB) && !defined(OS_CHROMEOS)
|
| #include <glib-object.h>
|
| #endif
|
|
|
| @@ -131,7 +131,7 @@
|
| #if defined(OS_MACOSX)
|
| base::mac::ScopedNSAutoreleasePool pool;
|
| #endif
|
| -#if defined(USE_GLIB)
|
| +#if defined(USE_GLIB) && !defined(OS_CHROMEOS)
|
| // g_type_init will be deprecated in 2.36. 2.35 is the development
|
| // version for 2.36, hence do not call g_type_init starting 2.35.
|
| // http://developer.gnome.org/gobject/unstable/gobject-Type-Information.html#g-type-init
|
| @@ -140,7 +140,7 @@
|
| // Normally handled by BrowserMainLoop::InitializeToolkit().
|
| g_type_init();
|
| #endif
|
| -#endif // defined(USE_GLIB)
|
| +#endif // defined(USE_GLIB) && !defined(OS_CHROMEOS)
|
| base::AtExitManager exit_manager;
|
| base::CommandLine::Init(argc, argv);
|
| logging::LoggingSettings settings;
|
|
|