chore: fix lint

This commit is contained in:
Samuel Attard 2021-03-05 16:54:18 -08:00
parent 59432fe30a
commit 54cc68dd7a
7 changed files with 21 additions and 15 deletions

View file

@ -30,6 +30,7 @@
#include "chrome/common/chrome_version.h" #include "chrome/common/chrome_version.h"
#include "components/net_log/chrome_net_log.h" #include "components/net_log/chrome_net_log.h"
#include "components/network_hints/common/network_hints.mojom.h" #include "components/network_hints/common/network_hints.mojom.h"
#include "content/browser/site_instance_impl.h"
#include "content/public/browser/browser_main_runner.h" #include "content/public/browser/browser_main_runner.h"
#include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_ppapi_host.h"
#include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_task_traits.h"
@ -46,7 +47,6 @@
#include "content/public/common/content_paths.h" #include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h" #include "content/public/common/content_switches.h"
#include "content/public/common/url_constants.h" #include "content/public/common/url_constants.h"
#include "content/browser/site_instance_impl.h"
#include "electron/buildflags/buildflags.h" #include "electron/buildflags/buildflags.h"
#include "electron/grit/electron_resources.h" #include "electron/grit/electron_resources.h"
#include "electron/shell/common/api/api.mojom.h" #include "electron/shell/common/api/api.mojom.h"
@ -197,8 +197,11 @@ namespace {
bool g_suppress_renderer_process_restart = false; bool g_suppress_renderer_process_restart = false;
// c.f. https://chromium-review.googlesource.com/c/chromium/src/+/2680274 // c.f. https://chromium-review.googlesource.com/c/chromium/src/+/2680274
content::SiteInfo GetSiteForURL(content::BrowserContext* browser_context, const GURL& url) { content::SiteInfo GetSiteForURL(content::BrowserContext* browser_context,
return content::SiteInfo::Create(content::IsolationContext(browser_context), content::UrlInfo(url, false), content::CoopCoepCrossOriginIsolatedInfo::CreateNonIsolated()); const GURL& url) {
return content::SiteInfo::Create(
content::IsolationContext(browser_context), content::UrlInfo(url, false),
content::CoopCoepCrossOriginIsolatedInfo::CreateNonIsolated());
} }
bool IsSameWebSite(content::BrowserContext* browser_context, bool IsSameWebSite(content::BrowserContext* browser_context,
@ -1074,7 +1077,8 @@ void ElectronBrowserClient::ConfigureNetworkContextParams(
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
cert_verifier::mojom::CertVerifierCreationParams* cert_verifier_creation_params) { cert_verifier::mojom::CertVerifierCreationParams*
cert_verifier_creation_params) {
DCHECK(browser_context); DCHECK(browser_context);
return NetworkContextServiceFactory::GetForContext(browser_context) return NetworkContextServiceFactory::GetForContext(browser_context)
->ConfigureNetworkContextParams(network_context_params, ->ConfigureNetworkContextParams(network_context_params,

View file

@ -163,8 +163,8 @@ class ElectronBrowserClient : public content::ContentBrowserClient,
bool in_memory, bool in_memory,
const base::FilePath& relative_partition_path, const base::FilePath& relative_partition_path,
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
cert_verifier::mojom::CertVerifierCreationParams* cert_verifier_creation_params) cert_verifier::mojom::CertVerifierCreationParams*
override; cert_verifier_creation_params) override;
network::mojom::NetworkContext* GetSystemNetworkContext() override; network::mojom::NetworkContext* GetSystemNetworkContext() override;
content::MediaObserver* GetMediaObserver() override; content::MediaObserver* GetMediaObserver() override;
content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;

View file

@ -33,7 +33,8 @@ class ElectronComponentExtensionResourceManager
const std::string& extension_id) const override; const std::string& extension_id) const override;
private: private:
void AddComponentResourceEntries(const webui::ResourcePath* entries, size_t size); void AddComponentResourceEntries(const webui::ResourcePath* entries,
size_t size);
// A map from a resource path to the resource ID. Used by // A map from a resource path to the resource ID. Used by
// IsComponentExtensionResource. // IsComponentExtensionResource.

View file

@ -84,8 +84,7 @@ void ElectronExtensionSystem::InitForRegularProfile(bool extensions_enabled) {
runtime_data_ = runtime_data_ =
std::make_unique<RuntimeData>(ExtensionRegistry::Get(browser_context_)); std::make_unique<RuntimeData>(ExtensionRegistry::Get(browser_context_));
quota_service_ = std::make_unique<QuotaService>(); quota_service_ = std::make_unique<QuotaService>();
user_script_manager_ = user_script_manager_ = std::make_unique<UserScriptManager>(browser_context_);
std::make_unique<UserScriptManager>(browser_context_);
app_sorting_ = std::make_unique<NullAppSorting>(); app_sorting_ = std::make_unique<NullAppSorting>();
extension_loader_ = extension_loader_ =
std::make_unique<ElectronExtensionLoader>(browser_context_); std::make_unique<ElectronExtensionLoader>(browser_context_);
@ -140,8 +139,7 @@ ServiceWorkerManager* ElectronExtensionSystem::service_worker_manager() {
return service_worker_manager_.get(); return service_worker_manager_.get();
} }
UserScriptManager* UserScriptManager* ElectronExtensionSystem::user_script_manager() {
ElectronExtensionSystem::user_script_manager() {
return new UserScriptManager(browser_context_); return new UserScriptManager(browser_context_);
} }

View file

@ -26,7 +26,8 @@ NetworkContextService::~NetworkContextService() = default;
void NetworkContextService::ConfigureNetworkContextParams( void NetworkContextService::ConfigureNetworkContextParams(
network::mojom::NetworkContextParams* network_context_params, network::mojom::NetworkContextParams* network_context_params,
cert_verifier::mojom::CertVerifierCreationParams* cert_verifier_creation_params) { cert_verifier::mojom::CertVerifierCreationParams*
cert_verifier_creation_params) {
bool in_memory = browser_context_->IsOffTheRecord(); bool in_memory = browser_context_->IsOffTheRecord();
const base::FilePath& path = browser_context_->GetPath(); const base::FilePath& path = browser_context_->GetPath();

View file

@ -158,7 +158,8 @@ SystemNetworkContextManager::CreateDefaultNetworkContextParams() {
ConfigureDefaultNetworkContextParams(network_context_params.get()); ConfigureDefaultNetworkContextParams(network_context_params.get());
cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params = cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New(); cert_verifier::mojom::CertVerifierCreationParams::New();
network_context_params->cert_verifier_params = network_context_params->cert_verifier_params =
content::GetCertVerifierParams(std::move(cert_verifier_creation_params)); content::GetCertVerifierParams(std::move(cert_verifier_creation_params));

View file

@ -144,7 +144,8 @@ class ElectronDelegatedFrameHostClient
return *view_->GetBackgroundColor(); return *view_->GetBackgroundColor();
} }
void OnFrameTokenChanged(uint32_t frame_token, base::TimeTicks activation_time) override { void OnFrameTokenChanged(uint32_t frame_token,
base::TimeTicks activation_time) override {
view_->render_widget_host()->DidProcessFrame(frame_token, activation_time); view_->render_widget_host()->DidProcessFrame(frame_token, activation_time);
} }