Index: Source/core/page/NavigatorBase.cpp |
diff --git a/Source/core/page/NavigatorBase.cpp b/Source/core/page/NavigatorBase.cpp |
index dc89ad58b88acd8caea71f4445ad9cdc8b2c32b0..76b0b809da4c46d9a96acd16ff271aacaf9f7359 100644 |
--- a/Source/core/page/NavigatorBase.cpp |
+++ b/Source/core/page/NavigatorBase.cpp |
@@ -28,26 +28,8 @@ |
#include "core/page/NavigatorBase.h" |
#include "core/platform/network/NetworkStateNotifier.h" |
-#include "wtf/CPU.h" |
#include "wtf/text/WTFString.h" |
-#if OS(LINUX) |
-#include "sys/utsname.h" |
-#include "wtf/StdLibExtras.h" |
-#endif |
- |
-#ifndef WEBCORE_NAVIGATOR_PLATFORM |
-#if OS(DARWIN) && (CPU(PPC) || CPU(PPC64)) |
-#define WEBCORE_NAVIGATOR_PLATFORM "MacPPC" |
-#elif OS(DARWIN) && (CPU(X86) || CPU(X86_64)) |
-#define WEBCORE_NAVIGATOR_PLATFORM "MacIntel" |
-#elif OS(WINDOWS) |
-#define WEBCORE_NAVIGATOR_PLATFORM "Win32" |
-#else |
-#define WEBCORE_NAVIGATOR_PLATFORM "" |
-#endif |
-#endif // ifndef WEBCORE_NAVIGATOR_PLATFORM |
- |
#ifndef WEBCORE_NAVIGATOR_PRODUCT |
#define WEBCORE_NAVIGATOR_PRODUCT "Gecko" |
#endif // ifndef WEBCORE_NAVIGATOR_PRODUCT |
@@ -71,31 +53,6 @@ NavigatorBase::~NavigatorBase() |
{ |
} |
-String NavigatorBase::appName() const |
-{ |
- return "Netscape"; |
-} |
- |
-String NavigatorBase::appVersion() const |
-{ |
- // Version is everything in the user agent string past the "Mozilla/" prefix. |
- const String& agent = userAgent(); |
- return agent.substring(agent.find('/') + 1); |
-} |
- |
-String NavigatorBase::platform() const |
-{ |
-#if OS(LINUX) |
- if (!String(WEBCORE_NAVIGATOR_PLATFORM).isEmpty()) |
- return WEBCORE_NAVIGATOR_PLATFORM; |
- struct utsname osname; |
- DEFINE_STATIC_LOCAL(String, platformName, (uname(&osname) >= 0 ? String(osname.sysname) + String(" ") + String(osname.machine) : emptyString())); |
- return platformName; |
-#else |
- return WEBCORE_NAVIGATOR_PLATFORM; |
-#endif |
-} |
- |
String NavigatorBase::appCodeName() const |
{ |
return "Mozilla"; |