Differentiate TOUCH_UI builds in crash reporting.

base/linux_util.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/linux_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <glib.h>
@@ skipping 114 matching lines @@
 
 namespace base {
 
 // Account for the terminating null character.
 static const int kDistroSize = 128 + 1;
 
 // We use this static string to hold the Linux distro info. If we
 // crash, the crash handler code will send this in the crash dump.
 char g_linux_distro[kDistroSize] =
 #if defined(OS_CHROMEOS)
+#if defined(TOUCH_UI)

[Nico, 2011/11/09 20:09:05]

Would

#if defined(TOUCH_UI)
#elif defined(OS_CHROMEOS)
#else
#endif

work as well? Then you don't need a nested #if

[Rick Byers, 2011/11/09 20:17:55]

That wouldn't really be correct - we can have TOUCH_UI builds that aren't
OS_CHROMEOS (although I'm not concerned with those scenarios here).  If you like
I can do "#if defined(OS_CHROMEOS) && defined(TOUCH_UI)" to avoid the nested if,
but that'll be a little redundant.

[Nico, 2011/11/09 20:20:42]

I like that a bit better, but it's fine either way.

+    "CrOS Touch";
+#else
     "CrOS";
+#endif
 #else  // if defined(OS_LINUX)
     "Unknown";
 #endif
 
 std::string GetLinuxDistro() {
 #if defined(OS_CHROMEOS)
   return g_linux_distro;
 #elif defined(OS_LINUX)
   LinuxDistroHelper* distro_state_singleton = LinuxDistroHelper::GetInstance();
   LinuxDistroState state = distro_state_singleton->State();
@@ skipping 150 matching lines @@
 
     if (0 == strncmp(expected_data.c_str(), syscall_data.get(),
                      expected_data.length())) {
       return current_tid;
     }
   }
   return -1;
 }
 
 }  // namespace base