From 948e7c4055ec03452b0ea6d29044ec8395186287 Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 8 Mar 2016 17:51:16 +0900 Subject: [PATCH] virutal should not be used together with override --- brightray/browser/network_delegate.h | 5 ++--- brightray/browser/permission_manager.cc | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/brightray/browser/network_delegate.h b/brightray/browser/network_delegate.h index 113587540080..a561fc059024 100644 --- a/brightray/browser/network_delegate.h +++ b/brightray/browser/network_delegate.h @@ -66,9 +66,8 @@ class NetworkDelegate : public net::NetworkDelegate { bool OnCanEnablePrivacyMode( const GURL& url, const GURL& first_party_for_cookies) const override; - - virtual bool OnAreStrictSecureCookiesEnabled() const override; - virtual bool OnAreExperimentalCookieFeaturesEnabled() const override; + bool OnAreStrictSecureCookiesEnabled() const override; + bool OnAreExperimentalCookieFeaturesEnabled() const override; bool OnCancelURLRequestWithPolicyViolatingReferrerHeader( const net::URLRequest& request, const GURL& target_url, diff --git a/brightray/browser/permission_manager.cc b/brightray/browser/permission_manager.cc index eff85ddc1200..4492e749c8af 100644 --- a/brightray/browser/permission_manager.cc +++ b/brightray/browser/permission_manager.cc @@ -53,6 +53,7 @@ int PermissionManager::RequestPermissions( callback.Run(permissionStatuses); return kNoPendingOperation; } + void PermissionManager::CancelPermissionRequest(int request_id) { }