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

Unified Diff: remoting/base/chromoting_event.cc

Issue 2910513002: [CRD iOS] Fix telemetry issues (Closed)
Patch Set: Resolve feedback Created 3 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 | remoting/ios/domain/host_info.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/base/chromoting_event.cc
diff --git a/remoting/base/chromoting_event.cc b/remoting/base/chromoting_event.cc
index 2991a4c3fc8cedb75bbf6ce3d9911b266272f53b..ea81033b0f8a61d4f8a0801b4a4b120655003451 100644
--- a/remoting/base/chromoting_event.cc
+++ b/remoting/base/chromoting_event.cc
@@ -107,14 +107,16 @@ void ChromotingEvent::AddSystemInfo() {
Os os = Os::CHROMOTING_LINUX;
#elif defined(OS_CHROMEOS)
Os os = Os::CHROMOTING_CHROMEOS;
+#elif defined(OS_IOS)
+ // This needs to precede the OS_MACOSX check since iOS will also define the
+ // OS_MACOSX macro.
+ Os os = Os::CHROMOTING_IOS;
#elif defined(OS_MACOSX)
Os os = Os::CHROMOTING_MAC;
#elif defined(OS_WIN)
Os os = Os::CHROMOTING_WINDOWS;
#elif defined(OS_ANDROID)
Os os = Os::CHROMOTING_ANDROID;
-#elif defined(OS_IOS)
- Os os = Os::CHROMOTING_IOS;
#else
Os os = Os::OTHER;
#endif
« no previous file with comments | « no previous file | remoting/ios/domain/host_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698