OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2000 Harri Porten (porten@kde.org) | 2 * Copyright (C) 2000 Harri Porten (porten@kde.org) |
3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org) | 3 * Copyright (c) 2000 Daniel Molkentin (molkentin@kde.org) |
4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org) | 4 * Copyright (c) 2000 Stefan Schimanski (schimmi@kde.org) |
5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. | 5 * Copyright (C) 2003, 2004, 2005, 2006 Apple Computer, Inc. |
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) | 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) |
7 * | 7 * |
8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
9 * modify it under the terms of the GNU Lesser General Public | 9 * modify it under the terms of the GNU Lesser General Public |
10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
(...skipping 10 matching lines...) Expand all Loading... |
21 */ | 21 */ |
22 | 22 |
23 #include "config.h" | 23 #include "config.h" |
24 #include "core/page/Navigator.h" | 24 #include "core/page/Navigator.h" |
25 | 25 |
26 #include "bindings/v8/ScriptController.h" | 26 #include "bindings/v8/ScriptController.h" |
27 #include "core/dom/Document.h" | 27 #include "core/dom/Document.h" |
28 #include "core/loader/CookieJar.h" | 28 #include "core/loader/CookieJar.h" |
29 #include "core/loader/FrameLoader.h" | 29 #include "core/loader/FrameLoader.h" |
30 #include "core/page/Frame.h" | 30 #include "core/page/Frame.h" |
| 31 #include "core/page/NavigatorID.h" |
31 #include "core/page/Page.h" | 32 #include "core/page/Page.h" |
32 #include "core/page/Settings.h" | 33 #include "core/page/Settings.h" |
33 #include "core/platform/Language.h" | 34 #include "core/platform/Language.h" |
34 #include "core/plugins/DOMMimeTypeArray.h" | 35 #include "core/plugins/DOMMimeTypeArray.h" |
35 #include "core/plugins/DOMPluginArray.h" | 36 #include "core/plugins/DOMPluginArray.h" |
36 | 37 |
37 namespace WebCore { | 38 namespace WebCore { |
38 | 39 |
39 Navigator::Navigator(Frame* frame) | 40 Navigator::Navigator(Frame* frame) |
40 : DOMWindowProperty(frame) | 41 : DOMWindowProperty(frame) |
(...skipping 19 matching lines...) Expand all Loading... |
60 Settings* settings = frame->settings(); | 61 Settings* settings = frame->settings(); |
61 if (!settings) | 62 if (!settings) |
62 return false; | 63 return false; |
63 return settings->needsSiteSpecificQuirks(); | 64 return settings->needsSiteSpecificQuirks(); |
64 } | 65 } |
65 | 66 |
66 String Navigator::appVersion() const | 67 String Navigator::appVersion() const |
67 { | 68 { |
68 if (!m_frame) | 69 if (!m_frame) |
69 return String(); | 70 return String(); |
70 String appVersion = NavigatorBase::appVersion(); | 71 String appVersion = NavigatorID::appVersion(this); |
71 if (shouldHideFourDot(m_frame)) | 72 if (shouldHideFourDot(m_frame)) |
72 appVersion.replace("4.", "4_"); | 73 appVersion.replace("4.", "4_"); |
73 return appVersion; | 74 return appVersion; |
74 } | 75 } |
75 | 76 |
76 String Navigator::language() const | 77 String Navigator::language() const |
77 { | 78 { |
78 return defaultLanguage(); | 79 return defaultLanguage(); |
79 } | 80 } |
80 | 81 |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
126 | 127 |
127 return true; | 128 return true; |
128 } | 129 } |
129 | 130 |
130 void Navigator::getStorageUpdates() | 131 void Navigator::getStorageUpdates() |
131 { | 132 { |
132 // FIXME: Remove this method or rename to yieldForStorageUpdates. | 133 // FIXME: Remove this method or rename to yieldForStorageUpdates. |
133 } | 134 } |
134 | 135 |
135 } // namespace WebCore | 136 } // namespace WebCore |
OLD | NEW |