chore: fix lint

electron · May 19, 2022 · 5b6af7f · 5b6af7f
1 parent 3c44b66
commit 5b6af7f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/patches/chromium/printing.patch b/patches/chromium/printing.patch
@@ -113,7 +113,7 @@ index 1e158ecd686e775f656d5a05a9d916ce8f075fa8..20613012d1e6f435c3211d78ec311cf0
 
  void PrintJobWorkerOop::UnregisterServiceManagerClient() {
 diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc
-index e74a2d0858c187b11ac322033b122e046a45967e..5f5b5f8a438601dbe3a77976ba4db5ffdcffc58f 100644
+index e74a2d0858c187b11ac322033b122e046a45967e..1e190f58d61a1a3767c7d1e1e11c27fa972c1c03 100644
 --- a/chrome/browser/printing/print_view_manager_base.cc
 +++ b/chrome/browser/printing/print_view_manager_base.cc
 @@ -30,10 +30,10 @@
@@ -466,7 +466,7 @@ index 746df417a23f7760818ba265d4a7d589dec8bf34..0027387d4717c59f2df3f279caf7aa0d
    // This means we are _blocking_ until all the necessary pages have been
    // rendered or the print settings are being loaded.
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
-index b2bd74f28f70bc601ec47820030ad965b19cf068..84afee94bcc582e1e73d775fb92acfa120bb932d 100644
+index b2bd74f28f70bc601ec47820030ad965b19cf068..027e4c0b78d44b69504d248755bf7f25ff423361 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.cc
 @@ -21,7 +21,7 @@ FakePrintRenderFrame::FakePrintRenderFrame(
@@ -479,7 +479,7 @@ index b2bd74f28f70bc601ec47820030ad965b19cf068..84afee94bcc582e1e73d775fb92acfa1
  void FakePrintRenderFrame::PrintWithParams(mojom::PrintPagesParamsPtr params) {
    NOTREACHED();
 diff --git a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
-index 42f9f296e6ef65a934167c2d4773e504020378bc..21deee951e3d14d6bfc0e831167faa3575f35884 100644
+index 42f9f296e6ef65a934167c2d4773e504020378bc..3ac69d39e4eb380f97cb779be1e9ad8706ce8243 100644
 --- a/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 +++ b/chrome/browser/ui/webui/print_preview/fake_print_render_frame.h
 @@ -25,7 +25,7 @@ class FakePrintRenderFrame : public mojom::PrintRenderFrame {
@@ -515,7 +515,7 @@ index 82591f8c2abbc1a180ef62f7264a68ca279e9b9c..ad27a15ba3028af1046482192dec789d
 
  void PdfPrintManager::ShowInvalidPrinterSettingsError() {
 diff --git a/components/printing/common/print.mojom b/components/printing/common/print.mojom
-index f2c17a8fecc36ea18de71598b582e206661763c5..965aac5376d43952d85c4d2724a60f850bc91d46 100644
+index f2c17a8fecc36ea18de71598b582e206661763c5..599b34690da042b57fcd78d0c0557d183ce10c0f 100644
 --- a/components/printing/common/print.mojom
 +++ b/components/printing/common/print.mojom
 @@ -280,7 +280,7 @@ enum PrintFailureReason {
@@ -537,7 +537,7 @@ index f2c17a8fecc36ea18de71598b582e206661763c5..965aac5376d43952d85c4d2724a60f85
    // Tells the browser that there are invalid printer settings.
    ShowInvalidPrinterSettingsError();
 diff --git a/components/printing/renderer/print_render_frame_helper.cc b/components/printing/renderer/print_render_frame_helper.cc
-index 1664ac8233e74cadcf19ebc53e41cef37d13019c..289738b1e31148839af8f1c710d855325614c857 100644
+index 1664ac8233e74cadcf19ebc53e41cef37d13019c..c3909745f02ed4df8f1dd1fb1b2c1192bc3861ff 100644
 --- a/components/printing/renderer/print_render_frame_helper.cc
 +++ b/components/printing/renderer/print_render_frame_helper.cc
 @@ -42,6 +42,7 @@
@@ -737,7 +737,7 @@ index 1664ac8233e74cadcf19ebc53e41cef37d13019c..289738b1e31148839af8f1c710d85532
 
  bool PrintRenderFrameHelper::PreviewPageRendered(
 diff --git a/components/printing/renderer/print_render_frame_helper.h b/components/printing/renderer/print_render_frame_helper.h
-index f118cae62de1cebb78c8193365bafcaba3b863a8..1388ed6f93b565f2da58dac1aabe6cb2f6b3d31d 100644
+index f118cae62de1cebb78c8193365bafcaba3b863a8..6c8bb35f6ea00b8366134a3f00d1a43fa22d81b5 100644
 --- a/components/printing/renderer/print_render_frame_helper.h
 +++ b/components/printing/renderer/print_render_frame_helper.h
 @@ -255,7 +255,7 @@ class PrintRenderFrameHelper

diff --git a/shell/browser/extensions/electron_extensions_browser_client.cc b/shell/browser/extensions/electron_extensions_browser_client.cc
@@ -4,6 +4,7 @@
 
 #include "shell/browser/extensions/electron_extensions_browser_client.h"
 
+#include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ -313,7 +314,7 @@ void ElectronExtensionsBrowserClient::BroadcastEventToRenderers(
   std::transform(args.begin(), args.end(), event_args.begin(),
                  [](const base::Value& arg) { return arg.Clone(); });
   auto event = std::make_unique<extensions::Event>(histogram_value, event_name,
-                                       std::move(event_args));
+                                                   std::move(event_args));
   auto& context_map = ElectronBrowserContext::browser_context_map();
   for (auto const& entry : context_map) {
     if (entry.second) {

diff --git a/shell/browser/media/media_capture_devices_dispatcher.cc b/shell/browser/media/media_capture_devices_dispatcher.cc
@@ -60,7 +60,7 @@ MediaCaptureDevicesDispatcher::GetVideoCaptureDevices() {
 void MediaCaptureDevicesDispatcher::GetDefaultDevices(
     bool audio,
     bool video,
-    blink::mojom::StreamDevices& devices) {
+    blink::mojom::StreamDevices& devices) {  // NOLINT(runtime/references)
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(audio || video);
 

diff --git a/shell/browser/media/media_capture_devices_dispatcher.h b/shell/browser/media/media_capture_devices_dispatcher.h
@@ -30,9 +30,10 @@ class MediaCaptureDevicesDispatcher : public content::MediaObserver {
   // If the return list is empty, it means there is no available device on the
   // OS.
   // Called on the UI thread.
-  void GetDefaultDevices(bool audio,
-                         bool video,
-                         blink::mojom::StreamDevices& devices);
+  void GetDefaultDevices(
+      bool audio,
+      bool video,
+      blink::mojom::StreamDevices& devices);  // NOLINT(runtime/references)
 
   // Helpers for picking particular requested devices, identified by raw id.
   // If the device requested is not available it will return NULL.

diff --git a/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm b/shell/browser/ui/cocoa/electron_inspectable_web_contents_view.mm
@@ -176,7 +176,8 @@ - (void)setIsDocked:(BOOL)docked activate:(BOOL)activate {
   auto devToolsView = devToolsWebContents->GetNativeView().GetNativeNSView();
   if (!docked) {
     auto styleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
-                     NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable |
+                     NSWindowStyleMaskMiniaturizable |
+                     NSWindowStyleMaskResizable |
                      NSWindowStyleMaskTexturedBackground |
                      NSWindowStyleMaskUnifiedTitleAndToolbar;
     devtools_window_.reset([[EventDispatchingWindow alloc]