Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / frame / Navigator.h

diff --git a/src/third_party/WebKit/Source/core/frame/Navigator.h b/src/third_party/WebKit/Source/core/frame/Navigator.h
index 3e1b14d..42df704 100644 (file)
--- a/src/third_party/WebKit/Source/core/frame/Navigator.h
+++ b/src/third_party/WebKit/Source/core/frame/Navigator.h
@@ -22,9 +22,11 @@
 
 #include "bindings/v8/ScriptWrappable.h"
 #include "core/frame/DOMWindowProperty.h"
-#include "core/frame/NavigatorBase.h"
-#include "heap/Handle.h"
+#include "core/frame/NavigatorID.h"
+#include "core/frame/NavigatorLanguage.h"
+#include "core/frame/NavigatorOnLine.h"
 #include "platform/Supplementable.h"
+#include "platform/heap/Handle.h"
 #include "wtf/Forward.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
@@ -39,7 +41,7 @@ class PluginData;
 
 typedef int ExceptionCode;
 
-class Navigator FINAL : public RefCountedWillBeGarbageCollectedFinalized<Navigator>, public NavigatorBase, public ScriptWrappable, public DOMWindowProperty, public WillBeHeapSupplementable<Navigator> {
+class Navigator FINAL : public RefCountedWillBeGarbageCollectedFinalized<Navigator>, public NavigatorID, public NavigatorLanguage, public NavigatorOnLine, public ScriptWrappable, public DOMWindowProperty, public WillBeHeapSupplementable<Navigator> {
     WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(Navigator);
 public:
     static PassRefPtrWillBeRawPtr<Navigator> create(LocalFrame* frame)
@@ -49,7 +51,6 @@ public:
 
     virtual ~Navigator();
 
-    AtomicString language() const;
     DOMPluginArray* plugins() const;
     DOMMimeTypeArray* mimeTypes() const;
     bool cookieEnabled() const;