Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 10 insertions, 10 deletions

diff --git a/WebCore/page/Navigator.h b/WebCore/page/Navigator.h
index c6acfd5..3380c9c 100644
--- a/WebCore/page/Navigator.h
+++ b/WebCore/page/Navigator.h
@@ -28,18 +28,21 @@
 
 namespace WebCore {
 
+    class DOMMimeTypeArray;
+    class DOMPluginArray;
     class Frame;
     class Geolocation;
-    class MimeTypeArray;
     class PluginData;
+<<<<<<< HEAD
     class PluginArray;
 #if PLATFORM(ANDROID)
     class ApplicationInstalledCallback;
     class Connection;
 #endif
 
-
-    typedef int ExceptionCode;
+=======
+    class String;
+>>>>>>> webkit.org at r63173
 
     class Navigator : public NavigatorBase, public RefCounted<Navigator> {
     public:
@@ -51,8 +54,8 @@ namespace WebCore {
 
         String appVersion() const;
         String language() const;
-        PluginArray* plugins() const;
-        MimeTypeArray* mimeTypes() const;
+        DOMPluginArray* plugins() const;
+        DOMMimeTypeArray* mimeTypes() const;
         bool cookieEnabled() const;
         bool javaEnabled() const;
 
@@ -76,14 +79,11 @@ namespace WebCore {
         void getStorageUpdates();
 #endif
 
-        void registerProtocolHandler(const String& scheme, const String& url, const String& title, ExceptionCode& ec);
-        void registerContentHandler(const String& mimeType, const String& url, const String& title, ExceptionCode& ec);
-
     private:
         Navigator(Frame*);
         Frame* m_frame;
-        mutable RefPtr<PluginArray> m_plugins;
-        mutable RefPtr<MimeTypeArray> m_mimeTypes;
+        mutable RefPtr<DOMPluginArray> m_plugins;
+        mutable RefPtr<DOMMimeTypeArray> m_mimeTypes;
         mutable RefPtr<Geolocation> m_geolocation;
 #if PLATFORM(ANDROID)
         mutable RefPtr<Connection> m_connection;