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

Unified Diff: Source/core/frame/NavigatorID.cpp

Issue 896463002: Remove the WEBCORE_NAVIGATOR_* defines (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 11 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 | « Source/core/frame/Navigator.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « Source/core/frame/Navigator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698