| Index: Source/core/frame/NavigatorID.cpp
|
| diff --git a/Source/core/frame/NavigatorID.cpp b/Source/core/frame/NavigatorID.cpp
|
| index 59d930acb08efe0e71dab0b182a789d04379ff69..681f341cb3bd09b2190facc0fc815bfea5642929 100644
|
| --- a/Source/core/frame/NavigatorID.cpp
|
| +++ b/Source/core/frame/NavigatorID.cpp
|
| @@ -32,15 +32,11 @@
|
| #include "config.h"
|
| #include "core/frame/NavigatorID.h"
|
|
|
| -#if !defined(WEBCORE_NAVIGATOR_PLATFORM) && OS(POSIX) && !OS(MACOSX)
|
| +#if !OS(MACOSX) && !OS(WIN)
|
| #include "wtf/Threading.h"
|
| #include <sys/utsname.h>
|
| #endif
|
|
|
| -#ifndef WEBCORE_NAVIGATOR_PRODUCT
|
| -#define WEBCORE_NAVIGATOR_PRODUCT "Gecko"
|
| -#endif // ifndef WEBCORE_NAVIGATOR_PRODUCT
|
| -
|
| namespace blink {
|
|
|
| String NavigatorID::appCodeName()
|
| @@ -62,9 +58,7 @@ String NavigatorID::appVersion()
|
|
|
| String NavigatorID::platform()
|
| {
|
| -#if defined(WEBCORE_NAVIGATOR_PLATFORM)
|
| - return WEBCORE_NAVIGATOR_PLATFORM;
|
| -#elif OS(MACOSX)
|
| +#if OS(MACOSX)
|
| // Match Safari and Mozilla on Mac x86.
|
| return "MacIntel";
|
| #elif OS(WIN)
|
| @@ -79,7 +73,7 @@ String NavigatorID::platform()
|
|
|
| String NavigatorID::product()
|
| {
|
| - return WEBCORE_NAVIGATOR_PRODUCT;
|
| + return "Gecko";
|
| }
|
|
|
| } // namespace blink
|
|
|