From 554ad93d45beb8f565b788afb3e3e27c74c1a144 Mon Sep 17 00:00:00 2001 From: David Sanders Date: Thu, 22 Oct 2020 13:24:59 -0700 Subject: [PATCH] chore: prefer empty() check for readability (#26109) --- shell/browser/api/electron_api_base_window.cc | 2 +- shell/browser/api/electron_api_web_contents.cc | 4 ++-- shell/browser/browser_win.cc | 6 +++--- shell/browser/electron_browser_context.cc | 2 +- shell/browser/electron_download_manager_delegate.cc | 2 +- shell/browser/native_window_views_win.cc | 2 +- shell/browser/osr/osr_render_widget_host_view.cc | 2 +- shell/browser/ui/autofill_popup.cc | 2 +- shell/browser/ui/message_box_win.cc | 2 +- shell/common/gin_converters/guid_converter.h | 2 +- shell/renderer/api/electron_api_context_bridge.cc | 4 ++-- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/shell/browser/api/electron_api_base_window.cc b/shell/browser/api/electron_api_base_window.cc index 6b0020335584..b0bf127d4940 100644 --- a/shell/browser/api/electron_api_base_window.cc +++ b/shell/browser/api/electron_api_base_window.cc @@ -951,7 +951,7 @@ std::vector> BaseWindow::GetChildWindows() const { v8::Local BaseWindow::GetBrowserView( gin_helper::Arguments* args) const { - if (browser_views_.size() == 0) { + if (browser_views_.empty()) { return v8::Null(isolate()); } else if (browser_views_.size() == 1) { auto first_view = browser_views_.begin(); diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc index 7f086832fd03..5b660b4ae0a9 100644 --- a/shell/browser/api/electron_api_web_contents.cc +++ b/shell/browser/api/electron_api_web_contents.cc @@ -406,7 +406,7 @@ base::string16 GetDefaultPrinterAsync() { if (printer_name.empty()) { printing::PrinterList printers; print_backend->EnumeratePrinters(&printers); - if (printers.size() > 0) + if (!printers.empty()) printer_name = printers.front().printer_name; } return base::UTF8ToUTF16(printer_name); @@ -2187,7 +2187,7 @@ void WebContents::Print(gin::Arguments* args) { continue; } } - if (page_range_list.GetList().size() > 0) + if (!page_range_list.GetList().empty()) settings.SetPath(printing::kSettingPageRange, std::move(page_range_list)); } diff --git a/shell/browser/browser_win.cc b/shell/browser/browser_win.cc index fa2f3c480b4e..52545731b2ce 100644 --- a/shell/browser/browser_win.cc +++ b/shell/browser/browser_win.cc @@ -203,7 +203,7 @@ std::vector GetLoginItemSettingsHelper( if ((base::CompareCaseInsensitiveASCII(it->Value(), exe.c_str())) == 0) { Browser::LaunchItem launch_item; base::string16 launch_path = options.path; - if (!(launch_path.size() > 0)) { + if (launch_path.empty()) { GetProcessExecPath(&launch_path); } launch_item.name = it->Name(); @@ -339,7 +339,7 @@ void GetApplicationInfoForProtocolUsingRegistry( } const base::string16 app_display_name = GetAppForProtocolUsingRegistry(url); - if (app_display_name.length() == 0) { + if (app_display_name.empty()) { promise.RejectWithErrorMessage( "Unable to retrieve application display name"); return; @@ -607,7 +607,7 @@ void Browser::SetLoginItemSettings(LoginItemSettings settings) { base::win::RegKey startup_approved_key( HKEY_CURRENT_USER, startup_approved_key_path.c_str(), KEY_ALL_ACCESS); PCWSTR key_name = - settings.name.size() > 0 ? settings.name.c_str() : GetAppUserModelID(); + !settings.name.empty() ? settings.name.c_str() : GetAppUserModelID(); if (settings.open_at_login) { base::string16 exe = settings.path; diff --git a/shell/browser/electron_browser_context.cc b/shell/browser/electron_browser_context.cc index 93e84e06bf49..74669053784c 100644 --- a/shell/browser/electron_browser_context.cc +++ b/shell/browser/electron_browser_context.cc @@ -228,7 +228,7 @@ void ElectronBrowserContext::InitPrefs() { auto* current_dictionaries = prefs()->Get(spellcheck::prefs::kSpellCheckDictionaries); // No configured dictionaries, the default will be en-US - if (current_dictionaries->GetList().size() == 0) { + if (current_dictionaries->GetList().empty()) { std::string default_code = spellcheck::GetCorrespondingSpellCheckLanguage( base::i18n::GetConfiguredLocale()); if (!default_code.empty()) { diff --git a/shell/browser/electron_download_manager_delegate.cc b/shell/browser/electron_download_manager_delegate.cc index 210ceace72a4..4fe6382a0358 100644 --- a/shell/browser/electron_download_manager_delegate.cc +++ b/shell/browser/electron_download_manager_delegate.cc @@ -107,7 +107,7 @@ void ElectronDownloadManagerDelegate::OnDownloadPathGenerated( if (!settings.parent_window) settings.parent_window = window; - if (settings.title.size() == 0) + if (settings.title.empty()) settings.title = item->GetURL().spec(); if (settings.default_path.empty()) settings.default_path = default_path; diff --git a/shell/browser/native_window_views_win.cc b/shell/browser/native_window_views_win.cc index 66464e26bb83..2d0fbfae08c5 100644 --- a/shell/browser/native_window_views_win.cc +++ b/shell/browser/native_window_views_win.cc @@ -384,7 +384,7 @@ void NativeWindowViews::SetForwardMouseMessages(bool forward) { RemoveWindowSubclass(legacy_window_, SubclassProc, 1); - if (forwarding_windows_.size() == 0) { + if (forwarding_windows_.empty()) { UnhookWindowsHookEx(mouse_hook_); mouse_hook_ = NULL; } diff --git a/shell/browser/osr/osr_render_widget_host_view.cc b/shell/browser/osr/osr_render_widget_host_view.cc index 430735c0808d..96061bb13abf 100644 --- a/shell/browser/osr/osr_render_widget_host_view.cc +++ b/shell/browser/osr/osr_render_widget_host_view.cc @@ -683,7 +683,7 @@ void OffScreenRenderWidgetHostView::CompositeFrame( SkBitmap frame; // Optimize for the case when there is no popup - if (proxy_views_.size() == 0 && !popup_host_view_) { + if (proxy_views_.empty() && !popup_host_view_) { frame = GetBacking(); } else { frame.allocN32Pixels(size_in_pixels.width(), size_in_pixels.height(), diff --git a/shell/browser/ui/autofill_popup.cc b/shell/browser/ui/autofill_popup.cc index 63aa64d7ac93..aad02085208f 100644 --- a/shell/browser/ui/autofill_popup.cc +++ b/shell/browser/ui/autofill_popup.cc @@ -148,7 +148,7 @@ int AutofillPopup::GetDesiredPopupWidth() { kEndPadding + 2 * kPopupBorderThickness + gfx::GetStringWidth(GetValueAt(i), GetValueFontListForRow(i)) + gfx::GetStringWidth(GetLabelAt(i), GetLabelFontListForRow(i)); - if (GetLabelAt(i).length() > 0) + if (!GetLabelAt(i).empty()) row_size += kNamePadding + kEndPadding; popup_width = std::max(popup_width, row_size); diff --git a/shell/browser/ui/message_box_win.cc b/shell/browser/ui/message_box_win.cc index 643ab8e01d09..19e0190f0501 100644 --- a/shell/browser/ui/message_box_win.cc +++ b/shell/browser/ui/message_box_win.cc @@ -161,7 +161,7 @@ DialogResult ShowTaskDialogUTF16(NativeWindow* parent, } else { MapToCommonID(buttons, &id_map, &config.dwCommonButtons, &dialog_buttons); } - if (dialog_buttons.size() > 0) { + if (!dialog_buttons.empty()) { config.pButtons = &dialog_buttons.front(); config.cButtons = dialog_buttons.size(); if (!no_link) diff --git a/shell/common/gin_converters/guid_converter.h b/shell/common/gin_converters/guid_converter.h index 4ecdc9c5bfdb..aaa6261428b4 100644 --- a/shell/common/gin_converters/guid_converter.h +++ b/shell/common/gin_converters/guid_converter.h @@ -37,7 +37,7 @@ struct Converter { UUID uid; - if (guid.length() > 0) { + if (!guid.empty()) { if (guid[0] == '{' && guid[guid.length() - 1] == '}') { guid = guid.substr(1, guid.length() - 2); } diff --git a/shell/renderer/api/electron_api_context_bridge.cc b/shell/renderer/api/electron_api_context_bridge.cc index fd219085f43e..93d7852800bf 100644 --- a/shell/renderer/api/electron_api_context_bridge.cc +++ b/shell/renderer/api/electron_api_context_bridge.cc @@ -564,7 +564,7 @@ void OverrideGlobalValueFromIsolatedWorld( const std::vector& key_path, v8::Local value, bool support_dynamic_properties) { - if (key_path.size() == 0) + if (key_path.empty()) return; auto* render_frame = GetRenderFrame(value); @@ -596,7 +596,7 @@ bool OverrideGlobalPropertyFromIsolatedWorld( v8::Local getter, v8::Local setter, gin_helper::Arguments* args) { - if (key_path.size() == 0) + if (key_path.empty()) return false; auto* render_frame = GetRenderFrame(getter);