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

Side by Side Diff: Source/core/page/NavigatorBase.cpp

Issue 14810003: Move CPU() macro to it's own header from wtf/Platform.h (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Move CPU() macro to it's own header from wtf/Platform.h Created 7 years, 7 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 unified diff | Download patch
OLDNEW
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 10 matching lines...) Expand all
21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 * 24 *
25 */ 25 */
26 26
27 #include "config.h" 27 #include "config.h"
28 #include "core/page/NavigatorBase.h" 28 #include "core/page/NavigatorBase.h"
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/CPU.h"
32 #include "wtf/text/WTFString.h"
32 33
33 #if OS(LINUX) 34 #if OS(LINUX)
34 #include "sys/utsname.h" 35 #include "sys/utsname.h"
35 #include <wtf/StdLibExtras.h> 36 #include "wtf/StdLibExtras.h"
36 #endif 37 #endif
37 38
38 #ifndef WEBCORE_NAVIGATOR_PLATFORM 39 #ifndef WEBCORE_NAVIGATOR_PLATFORM
39 #if OS(DARWIN) && (CPU(PPC) || CPU(PPC64)) 40 #if OS(DARWIN) && (CPU(PPC) || CPU(PPC64))
40 #define WEBCORE_NAVIGATOR_PLATFORM "MacPPC" 41 #define WEBCORE_NAVIGATOR_PLATFORM "MacPPC"
41 #elif OS(DARWIN) && (CPU(X86) || CPU(X86_64)) 42 #elif OS(DARWIN) && (CPU(X86) || CPU(X86_64))
42 #define WEBCORE_NAVIGATOR_PLATFORM "MacIntel" 43 #define WEBCORE_NAVIGATOR_PLATFORM "MacIntel"
43 #elif OS(WINDOWS) 44 #elif OS(WINDOWS)
44 #define WEBCORE_NAVIGATOR_PLATFORM "Win32" 45 #define WEBCORE_NAVIGATOR_PLATFORM "Win32"
45 #else 46 #else
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 { 120 {
120 return WEBCORE_NAVIGATOR_VENDOR_SUB; 121 return WEBCORE_NAVIGATOR_VENDOR_SUB;
121 } 122 }
122 123
123 bool NavigatorBase::onLine() const 124 bool NavigatorBase::onLine() const
124 { 125 {
125 return networkStateNotifier().onLine(); 126 return networkStateNotifier().onLine();
126 } 127 }
127 128
128 } // namespace WebCore 129 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/html/canvas/DataView.cpp ('k') | Source/core/platform/graphics/GraphicsContext3D.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698