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

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

Issue 16157007: Revert 203873 "net_watcher does not build in Ubuntu 13.04" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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: trunk/src/net/tools/net_watcher/net_watcher.cc
===================================================================
--- trunk/src/net/tools/net_watcher/net_watcher.cc (revision 203884)
+++ trunk/src/net/tools/net_watcher/net_watcher.cc (working copy)
@@ -134,12 +134,7 @@
#if (defined(OS_LINUX) || defined(OS_OPENBSD)) && !defined(OS_CHROMEOS)
// Needed so ProxyConfigServiceLinux can use gconf.
// Normally handled by BrowserMainLoop::InitializeToolkit().
- // From glib version 2.36 onwards, g_type_init is implicitly called and it is
- // deprecated.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
g_type_init();
-#pragma GCC diagnostic pop
#endif
base::AtExitManager exit_manager;
CommandLine::Init(argc, argv);
« 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