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

Unified Diff: net/tools/net_watcher/net_watcher.cc

Issue 315523002: Tweak to r274378 to make net_watcher build on chromeos bots. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 6 years, 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698