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

Unified Diff: remoting/host/setup/me2me_native_messaging_host_main.cc

Issue 2928423003: Fix ChromeOS build. (Closed)
Patch Set: Created 3 years, 6 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: remoting/host/setup/me2me_native_messaging_host_main.cc
diff --git a/remoting/host/setup/me2me_native_messaging_host_main.cc b/remoting/host/setup/me2me_native_messaging_host_main.cc
index f23a4a21c250b18b36f1f521e19393e31078d2a5..021ad017b6d4fdcdab47ce44517f84a26365acb6 100644
--- a/remoting/host/setup/me2me_native_messaging_host_main.cc
+++ b/remoting/host/setup/me2me_native_messaging_host_main.cc
@@ -44,9 +44,9 @@
#include "remoting/host/win/elevation_helpers.h"
#endif // defined(OS_WIN)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
#include <glib-object.h>
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
using remoting::protocol::PairingRegistry;
@@ -64,14 +64,14 @@ int Me2MeNativeMessagingHostMain(int argc, char** argv) {
base::mac::ScopedNSAutoreleasePool pool;
#endif // defined(OS_MACOSX)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) && !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
#if !GLIB_CHECK_VERSION(2, 35, 0)
g_type_init();
#endif
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
// Required to find the ICU data file, used by some file_util routines.
base::i18n::InitializeICU();
« 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