chore: follow Google C++ brace style

chore: use same variable names as in main
electron · May 9, 2024 · 7acf7b6 · 7acf7b6
1 parent 421925b
commit 7acf7b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/shell/browser/ui/inspectable_web_contents.cc b/shell/browser/ui/inspectable_web_contents.cc
@@ -683,11 +683,12 @@ void InspectableWebContents::LoadNetworkResource(DispatchCallback callback,
  url_loader_factory = network::SharedURLLoaderFactory::Create(
  std::make_unique<network::WrapperPendingSharedURLLoaderFactory>(
  std::move(pending_remote)));
- } else if (const auto* const handler =
+ } else if (const auto* const protocol_handler =
  protocol_registry->FindRegistered(gurl.scheme())) {
  url_loader_factory = network::SharedURLLoaderFactory::Create(
  std::make_unique<network::WrapperPendingSharedURLLoaderFactory>(
- ElectronURLLoaderFactory::Create(handler->first, handler->second)));
+ ElectronURLLoaderFactory::Create(protocol_handler->first,
+ protocol_handler->second)));
  } else {
  auto* partition = GetDevToolsWebContents()
  ->GetBrowserContext()

diff --git a/shell/common/api/electron_api_url_loader.cc b/shell/common/api/electron_api_url_loader.cc
@@ -483,25 +483,31 @@ SimpleURLLoaderWrapper::GetURLLoaderFactoryForURL(const GURL& url) {
  if (const bool bypass = request_options_ & kBypassCustomProtocolHandlers;
  !bypass) {
  const auto scheme = url.scheme();
- const auto* reg = ProtocolRegistry::FromBrowserContext(browser_context_);
+ const auto* const protocol_registry =
+ ProtocolRegistry::FromBrowserContext(browser_context_);
 
- if (const auto* handler = reg->FindIntercepted(scheme))
+ if (const auto* const protocol_handler =
+ protocol_registry->FindIntercepted(scheme)) {
  return network::SharedURLLoaderFactory::Create(
  std::make_unique<network::WrapperPendingSharedURLLoaderFactory>(
- ElectronURLLoaderFactory::Create(handler->first,
- handler->second)));
+ ElectronURLLoaderFactory::Create(protocol_handler->first,
+ protocol_handler->second)));
+ }
 
- if (const auto* handler = reg->FindRegistered(scheme))
+ if (const auto* const protocol_handler =
+ protocol_registry->FindRegistered(scheme)) {
  return network::SharedURLLoaderFactory::Create(
  std::make_unique<network::WrapperPendingSharedURLLoaderFactory>(
- ElectronURLLoaderFactory::Create(handler->first,
- handler->second)));
+ ElectronURLLoaderFactory::Create(protocol_handler->first,
+ protocol_handler->second)));
+ }
  }
 
- if (url.SchemeIsFile())
+ if (url.SchemeIsFile()) {
  return network::SharedURLLoaderFactory::Create(
  std::make_unique<network::WrapperPendingSharedURLLoaderFactory>(
  AsarURLLoaderFactory::Create()));
+ }
 
  return browser_context_->GetURLLoaderFactory();
 }