Merge branch 'master' into chrome52
This commit is contained in:
commit
b57665330c
203 changed files with 2352 additions and 1220 deletions
|
@ -57,11 +57,6 @@ class AtomRendererClient : public content::ContentRendererClient {
|
|||
content::RenderFrame* render_frame,
|
||||
const std::string& mime_type,
|
||||
const GURL& original_url) override;
|
||||
void GetNavigationErrorStrings(content::RenderFrame* render_frame,
|
||||
const blink::WebURLRequest& failed_request,
|
||||
const blink::WebURLError& error,
|
||||
std::string* error_html,
|
||||
base::string16* error_description) override;
|
||||
void AddSupportedKeySystems(
|
||||
std::vector<std::unique_ptr<::media::KeySystemProperties>>* key_systems)
|
||||
override;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue