mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update BrowserContext for Chrome 35

Browse source
This commit is contained in:
Adam Roben 2014-06-26 16:27:58 -04:00
parent 42b86242ea
commit 5b93dc74e6
2 changed files with 41 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
brightray/browser/browser_context.cc
View file

@ -155,14 +155,36 @@ net::URLRequestContextGetter*
return GetRequestContext(); return GetRequestContext();
} }
void BrowserContext::RequestMIDISysExPermission( void BrowserContext::RequestMidiSysExPermission(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id,
const GURL& requesting_frame, const GURL& requesting_frame,
const MIDISysExPermissionCallback& callback) { bool user_gesture,
const MidiSysExPermissionCallback& callback) {
callback.Run(false); callback.Run(false);
} }
void BrowserContext::CancelMidiSysExPermissionRequest(
int render_process_id,
int render_view_id,
int bridge_id,
const GURL& requesting_frame) {
}
void BrowserContext::RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
int bridge_id,
int group_id,
const GURL& requesting_frame,
const ProtectedMediaIdentifierPermissionCallback& callback) {
callback.Run(false);
}
void BrowserContext::CancelProtectedMediaIdentifierPermissionRequests(int group_id) {
}
content::ResourceContext* BrowserContext::GetResourceContext() { content::ResourceContext* BrowserContext::GetResourceContext() {
return resource_context_.get(); return resource_context_.get();
} }

19
brightray/browser/browser_context.h
View file

@ -55,11 +55,26 @@ class BrowserContext : public content::BrowserContext {
virtual net::URLRequestContextGetter* virtual net::URLRequestContextGetter*
GetMediaRequestContextForStoragePartition( GetMediaRequestContextForStoragePartition(
const base::FilePath& partition_path, bool in_memory); const base::FilePath& partition_path, bool in_memory);
virtual void RequestMIDISysExPermission( virtual void RequestMidiSysExPermission(
int render_process_id, int render_process_id,
int render_view_id, int render_view_id,
int bridge_id,
const GURL& requesting_frame, const GURL& requesting_frame,
const MIDISysExPermissionCallback&) OVERRIDE; bool user_gesture,
const MidiSysExPermissionCallback& callback) OVERRIDE;
virtual void CancelMidiSysExPermissionRequest(
int render_process_id,
int render_view_id,
int bridge_id,
const GURL& requesting_frame) OVERRIDE;
virtual void RequestProtectedMediaIdentifierPermission(
int render_process_id,
int render_view_id,
int bridge_id,
int group_id,
const GURL& requesting_frame,
const ProtectedMediaIdentifierPermissionCallback& callback) OVERRIDE;
virtual void CancelProtectedMediaIdentifierPermissionRequests(int group_id) OVERRIDE;
virtual content::ResourceContext* GetResourceContext() OVERRIDE; virtual content::ResourceContext* GetResourceContext() OVERRIDE;
virtual content::DownloadManagerDelegate* virtual content::DownloadManagerDelegate*
GetDownloadManagerDelegate() OVERRIDE; GetDownloadManagerDelegate() OVERRIDE;