mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages1 Wiki Activity Actions1

Use DefaultWebContentsDelegate in api::WebContents

Browse source
This commit is contained in:
Cheng Zhao 2015-06-05 13:41:45 +08:00
parent 7f7cdbf775
commit e8f33f51fb
2 changed files with 1 additions and 23 deletions

15
atom/browser/api/atom_api_web_contents.cc
View file

@ -21,7 +21,6 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "brightray/browser/inspectable_web_contents.h"
#include "brightray/browser/media/media_stream_devices_controller.h"
#include "content/public/browser/favicon_status.h"
#include "content/public/browser/guest_host.h"
#include "content/public/browser/navigation_details.h"
@ -223,20 +222,6 @@ void WebContents::EnumerateDirectory(content::WebContents* guest,
web_dialog_helper_->EnumerateDirectory(guest, request_id, path);
}
bool WebContents::CheckMediaAccessPermission(content::WebContents* web_contents,
const GURL& security_origin,
content::MediaStreamType type) {
return true;
}
void WebContents::RequestMediaAccessPermission(
content::WebContents*,
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) {
brightray::MediaStreamDevicesController controller(request, callback);
controller.TakeAction();
}
void WebContents::HandleKeyboardEvent(
content::WebContents* source,
const content::NativeWebKeyboardEvent& event) {

9
atom/browser/api/atom_api_web_contents.h
View file

@ -51,7 +51,7 @@ struct SetSizeParams {
class WebContents : public mate::EventEmitter,
public content::BrowserPluginGuestDelegate,
public content::WebContentsDelegate,
public brightray::DefaultWebContentsDelegate,
public content::WebContentsObserver,
public content::GpuDataManagerObserver {
public:
@ -157,13 +157,6 @@ class WebContents : public mate::EventEmitter,
void EnumerateDirectory(content::WebContents* web_contents,
int request_id,
const base::FilePath& path) override;
bool CheckMediaAccessPermission(content::WebContents* web_contents,
const GURL& security_origin,
content::MediaStreamType type) override;
void RequestMediaAccessPermission(
content::WebContents*,
const content::MediaStreamRequest&,
const content::MediaResponseCallback&) override;
void HandleKeyboardEvent(
content::WebContents* source,
const content::NativeWebKeyboardEvent& event) override;