OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 #include "core/platform/network/NetworkStateNotifier.h" | 30 #include "core/platform/network/NetworkStateNotifier.h" |
31 #include <wtf/text/WTFString.h> | 31 #include <wtf/text/WTFString.h> |
32 | 32 |
33 #if OS(LINUX) | 33 #if OS(LINUX) |
34 #include "sys/utsname.h" | 34 #include "sys/utsname.h" |
35 #include <wtf/StdLibExtras.h> | 35 #include <wtf/StdLibExtras.h> |
36 #endif | 36 #endif |
37 | 37 |
38 #ifndef WEBCORE_NAVIGATOR_PLATFORM | 38 #ifndef WEBCORE_NAVIGATOR_PLATFORM |
39 #if OS(MAC_OS_X) && (CPU(PPC) || CPU(PPC64)) | 39 #if OS(DARWIN) && (CPU(PPC) || CPU(PPC64)) |
40 #define WEBCORE_NAVIGATOR_PLATFORM "MacPPC" | 40 #define WEBCORE_NAVIGATOR_PLATFORM "MacPPC" |
41 #elif OS(MAC_OS_X) && (CPU(X86) || CPU(X86_64)) | 41 #elif OS(DARWIN) && (CPU(X86) || CPU(X86_64)) |
42 #define WEBCORE_NAVIGATOR_PLATFORM "MacIntel" | 42 #define WEBCORE_NAVIGATOR_PLATFORM "MacIntel" |
43 #elif OS(WINDOWS) | 43 #elif OS(WINDOWS) |
44 #define WEBCORE_NAVIGATOR_PLATFORM "Win32" | 44 #define WEBCORE_NAVIGATOR_PLATFORM "Win32" |
45 #else | 45 #else |
46 #define WEBCORE_NAVIGATOR_PLATFORM "" | 46 #define WEBCORE_NAVIGATOR_PLATFORM "" |
47 #endif | 47 #endif |
48 #endif // ifndef WEBCORE_NAVIGATOR_PLATFORM | 48 #endif // ifndef WEBCORE_NAVIGATOR_PLATFORM |
49 | 49 |
50 #ifndef WEBCORE_NAVIGATOR_PRODUCT | 50 #ifndef WEBCORE_NAVIGATOR_PRODUCT |
51 #define WEBCORE_NAVIGATOR_PRODUCT "Gecko" | 51 #define WEBCORE_NAVIGATOR_PRODUCT "Gecko" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 { | 119 { |
120 return WEBCORE_NAVIGATOR_VENDOR_SUB; | 120 return WEBCORE_NAVIGATOR_VENDOR_SUB; |
121 } | 121 } |
122 | 122 |
123 bool NavigatorBase::onLine() const | 123 bool NavigatorBase::onLine() const |
124 { | 124 { |
125 return networkStateNotifier().onLine(); | 125 return networkStateNotifier().onLine(); |
126 } | 126 } |
127 | 127 |
128 } // namespace WebCore | 128 } // namespace WebCore |
OLD | NEW |