Merge //content/child/permissions into Blink's permissions module.

third_party/WebKit/public/web/WebFrameClient.h

 /*
  * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 73 matching lines @@
 class WebFormElement;
 class WebInstalledAppClient;
 class WebMediaPlayer;
 class WebMediaPlayerClient;
 class WebMediaPlayerEncryptedMediaClient;
 class WebMediaPlayerSource;
 class WebMediaSession;
 class WebMediaStream;
 class WebMIDIClient;
 class WebNotificationPermissionCallback;
-class WebPermissionClient;
 class WebServiceWorkerProvider;
 class WebSocketHandle;
 class WebPlugin;
 class WebPresentationClient;
 class WebPushClient;
 class WebRTCPeerConnectionHandler;
 class WebScreenOrientationClient;
 class WebString;
 class WebURL;
 class WebURLResponse;
@@ skipping 558 matching lines @@
     // Called when elements preventing the sudden termination of the frame
     // become present or stop being present. |type| is the type of element
     // (BeforeUnload handler, Unload handler).
     enum SuddenTerminationDisablerType {
         BeforeUnloadHandler,
         UnloadHandler,
     };
     virtual void suddenTerminationDisablerChanged(bool present, SuddenTerminationDisablerType) { }
 
 
-    // Permissions ---------------------------------------------------------
-
-    // Access the embedder API for permission client.
-    virtual WebPermissionClient* permissionClient() { return 0; }
-
     // App Banners ---------------------------------------------------------
     virtual WebAppBannerClient* appBannerClient() { return 0; }
 
     // Navigator Content Utils  --------------------------------------------
 
     // Registers a new URL handler for the given protocol.
     virtual void registerProtocolHandler(const WebString& scheme,
         const WebURL& url,
         const WebString& title) { }
 
@@ skipping 33 matching lines @@
         return WebPageVisibilityStateVisible;
     }
 
 protected:
     virtual ~WebFrameClient() { }
 };
 
 } // namespace blink
 
 #endif