bsds: views/ and webkit/ support for FreeBSD/OpenBSD

webkit/glue/webkit_glue.cc

 // Copyright (c) 2006-2009 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 "config.h"
 #include "webkit/glue/webkit_glue.h"
 
 #if defined(OS_WIN)
 #include <objidl.h>
 #include <mlang.h>
-#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+#elif defined(OS_POSIX) && !defined(OS_MACOSX)
 #include <sys/utsname.h>
 #endif
 
 #include "BackForwardList.h"
 #include "Document.h"
 #include "FrameTree.h"
 #include "FrameView.h"
 #include "Frame.h"
 #include "GlyphPageTreeNode.h"
 #include "HistoryItem.h"
@@ skipping 339 matching lines @@
   std::string os_cpu;
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
   int32 os_major_version = 0;
   int32 os_minor_version = 0;
   int32 os_bugfix_version = 0;
   base::SysInfo::OperatingSystemVersionNumbers(&os_major_version,
                                                &os_minor_version,
                                                &os_bugfix_version);
 #endif
-#if !defined(OS_WIN) && !defined(OS_MACOSX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
   // Should work on any Posix system.
   struct utsname unixinfo;
   uname(&unixinfo);
 
   std::string cputype;
   // special case for biarch systems
   if (strcmp(unixinfo.machine, "x86_64") == 0 &&
       sizeof(void*) == sizeof(int32)) {
     cputype.assign("i686 (x86_64)");
   } else {
@@ skipping 32 matching lines @@
 // The other parameters are workarounds for broken websites:
 // - If mimic_chrome1 is true, produce a fake Chrome 1 string.
 // - If mimic_windows is true, produce a fake Windows Chrome string.
 void BuildUserAgent(bool mimic_chrome1, bool mimic_windows,
                     std::string* result) {
   const char kUserAgentPlatform[] =
 #if defined(OS_WIN)
       "Windows";
 #elif defined(OS_MACOSX)
       "Macintosh";
-#elif defined(OS_LINUX)
+#elif defined(USE_X11)
       "X11";              // strange, but that's what Firefox uses
 #else
       "?";
 #endif
 
   const char kUserAgentSecurity = 'U'; // "US" strength encryption
 
   // TODO(port): figure out correct locale
   const char kUserAgentLocale[] = "en-US";
 
@@ skipping 57 matching lines @@
     if (MatchPatternASCII(url.host(), "*.pointroll.com")) {
       // For cnn.com, which uses pointroll.com to serve their front door promo,
       // we must spoof Chrome 1.0 in order to avoid a blank page.
       // http://crbug.com/25934
       // TODO(dglazkov): Remove this once CNN's front door promo is
       // over or when pointroll fixes their sniffing.
       if (g_user_agent->mimic_chrome1_user_agent.empty())
         BuildUserAgent(true, false, &g_user_agent->mimic_chrome1_user_agent);
       return g_user_agent->mimic_chrome1_user_agent;
     }
-#if defined(OS_LINUX)
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
     else if (MatchPatternASCII(url.host(), "*.mail.yahoo.com")) {
       // mail.yahoo.com is ok with Windows Chrome but not Linux Chrome.
       // http://bugs.chromium.org/11136
       // TODO(evanm): remove this if Yahoo fixes their sniffing.
       if (g_user_agent->mimic_windows_user_agent.empty())
         BuildUserAgent(false, true, &g_user_agent->mimic_windows_user_agent);
       return g_user_agent->mimic_windows_user_agent;
     }
 #endif
   }
@@ skipping 32 matching lines @@
 
 bool IsMediaCacheEnabled() {
   return g_enable_media_cache;
 }
 
 void SetMediaCacheEnabled(bool enabled) {
   g_enable_media_cache = enabled;
 }
 
 } // namespace webkit_glue