diff --git a/shell/browser/api/electron_api_session.cc b/shell/browser/api/electron_api_session.cc index dbd62d1108..4cd44224fe 100644 --- a/shell/browser/api/electron_api_session.cc +++ b/shell/browser/api/electron_api_session.cc @@ -261,7 +261,7 @@ class ClearDataTask { } private: - // An individiual |content::BrowsingDataRemover::Remove...| operation as part + // An individual |content::BrowsingDataRemover::Remove...| operation as part // of a full |ClearDataTask|. This class manages its own lifetime, cleaning // itself up after the operation completes and notifies the task of the // result. diff --git a/shell/browser/extensions/api/scripting/scripting_api.cc b/shell/browser/extensions/api/scripting/scripting_api.cc index 8764b610af..f940a5bede 100644 --- a/shell/browser/extensions/api/scripting/scripting_api.cc +++ b/shell/browser/extensions/api/scripting/scripting_api.cc @@ -519,7 +519,7 @@ api::scripting::RegisteredContentScript CreateRegisteredContentScriptInfo( converted.reserve(sources.size()); for (auto& source : sources) { CHECK(source.file) - << "Content scripts don't allow arbtirary code strings"; + << "Content scripts don't allow arbitrary code strings"; converted.push_back(std::move(*source.file)); } return converted; diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h index 51d0c3303a..d387c8f793 100644 --- a/shell/browser/native_window.h +++ b/shell/browser/native_window.h @@ -448,7 +448,7 @@ class NativeWindow : public base::SupportsUserData, // Minimum and maximum size. std::optional size_constraints_; // Same as above but stored as content size, we are storing 2 types of size - // constraints beacause converting between them will cause rounding errors + // constraints because converting between them will cause rounding errors // on HiDPI displays on some environments. std::optional content_size_constraints_; diff --git a/shell/browser/native_window_views.cc b/shell/browser/native_window_views.cc index 7f0e8dc5f5..f7061d25c5 100644 --- a/shell/browser/native_window_views.cc +++ b/shell/browser/native_window_views.cc @@ -569,7 +569,7 @@ bool NativeWindowViews::IsVisible() const { // current window. bool visible = ::GetWindowLong(GetAcceleratedWidget(), GWL_STYLE) & WS_VISIBLE; - // WS_VISIBLE is true even if a window is miminized - explicitly check that. + // WS_VISIBLE is true even if a window is minimized - explicitly check that. return visible && !IsMinimized(); #else return widget()->IsVisible(); diff --git a/shell/browser/net/asar/asar_url_loader_factory.h b/shell/browser/net/asar/asar_url_loader_factory.h index d23aec3b49..636a630a21 100644 --- a/shell/browser/net/asar/asar_url_loader_factory.h +++ b/shell/browser/net/asar/asar_url_loader_factory.h @@ -9,7 +9,7 @@ namespace mojo { template -class PendingReciever; +class PendingReceiver; template class PendingRemote; } // namespace mojo diff --git a/shell/browser/net/proxying_url_loader_factory.h b/shell/browser/net/proxying_url_loader_factory.h index 754ff5be55..58add4c8f0 100644 --- a/shell/browser/net/proxying_url_loader_factory.h +++ b/shell/browser/net/proxying_url_loader_factory.h @@ -35,7 +35,7 @@ namespace mojo { template -class PendingReciever; +class PendingReceiver; template class PendingRemote; } // namespace mojo diff --git a/shell/browser/usb/electron_usb_delegate.h b/shell/browser/usb/electron_usb_delegate.h index 556fa42554..673fc34677 100644 --- a/shell/browser/usb/electron_usb_delegate.h +++ b/shell/browser/usb/electron_usb_delegate.h @@ -27,7 +27,7 @@ class RenderFrameHost; namespace mojo { template -class PendingReciever; +class PendingReceiver; template class PendingRemote; } // namespace mojo diff --git a/shell/browser/usb/usb_chooser_context.h b/shell/browser/usb/usb_chooser_context.h index fe216bf122..6ad48d3096 100644 --- a/shell/browser/usb/usb_chooser_context.h +++ b/shell/browser/usb/usb_chooser_context.h @@ -24,7 +24,7 @@ namespace mojo { template -class PendingReciever; +class PendingReceiver; template class PendingRemote; } // namespace mojo diff --git a/shell/common/extensions/api/browser_action.json b/shell/common/extensions/api/browser_action.json index 1b72d57269..a7c641c4b6 100644 --- a/shell/common/extensions/api/browser_action.json +++ b/shell/common/extensions/api/browser_action.json @@ -344,7 +344,7 @@ "name": "popupView", "type": "object", "optional": true, - "description": "JavaScript 'window' object for the popup window if it was succesfully opened.", + "description": "JavaScript 'window' object for the popup window if it was successfully opened.", "additionalProperties": { "type": "any" } diff --git a/shell/common/gin_converters/callback_converter.h b/shell/common/gin_converters/callback_converter.h index 51238aba67..ca2bc900c0 100644 --- a/shell/common/gin_converters/callback_converter.h +++ b/shell/common/gin_converters/callback_converter.h @@ -18,11 +18,11 @@ struct Converter> { const base::RepeatingCallback& val) { // We don't use CreateFunctionTemplate here because it creates a new // FunctionTemplate everytime, which is cached by V8 and causes leaks. - auto translater = + auto translator = base::BindRepeating(&gin_helper::NativeFunctionInvoker::Go, val); // To avoid memory leak, we ensure that the callback can only be called // for once. - return gin_helper::CreateFunctionFromTranslater(isolate, translater, true); + return gin_helper::CreateFunctionFromTranslator(isolate, translator, true); } static bool FromV8(v8::Isolate* isolate, v8::Local val, diff --git a/shell/common/gin_helper/callback.cc b/shell/common/gin_helper/callback.cc index 94f33493e2..fd6927e0ff 100644 --- a/shell/common/gin_helper/callback.cc +++ b/shell/common/gin_helper/callback.cc @@ -12,30 +12,30 @@ namespace gin_helper { namespace { -struct TranslaterHolder { - explicit TranslaterHolder(v8::Isolate* isolate) +struct TranslatorHolder { + explicit TranslatorHolder(v8::Isolate* isolate) : handle(isolate, v8::External::New(isolate, this)) { handle.SetWeak(this, &GC, v8::WeakCallbackType::kParameter); } - ~TranslaterHolder() { + ~TranslatorHolder() { if (!handle.IsEmpty()) { handle.ClearWeak(); handle.Reset(); } } - static void GC(const v8::WeakCallbackInfo& data) { + static void GC(const v8::WeakCallbackInfo& data) { delete data.GetParameter(); } v8::Global handle; - Translater translater; + Translator translator; }; -// Cached JavaScript version of |CallTranslater|. -v8::Persistent g_call_translater; +// Cached JavaScript version of |CallTranslator|. +v8::Persistent g_call_translator; -void CallTranslater(v8::Local external, +void CallTranslator(v8::Local external, v8::Local state, gin::Arguments* args) { // Whether the callback should only be called once. @@ -56,8 +56,8 @@ void CallTranslater(v8::Local external, } } - auto* holder = static_cast(external->Value()); - holder->translater.Run(args); + auto* holder = static_cast(external->Value()); + holder->translator.Run(args); // Free immediately for one-time callback. if (one_time) @@ -113,25 +113,25 @@ v8::Local SafeV8Function::NewHandle(v8::Isolate* isolate) const { return v8_function_->NewHandle(isolate); } -v8::Local CreateFunctionFromTranslater(v8::Isolate* isolate, - const Translater& translater, +v8::Local CreateFunctionFromTranslator(v8::Isolate* isolate, + const Translator& translator, bool one_time) { // The FunctionTemplate is cached. - if (g_call_translater.IsEmpty()) - g_call_translater.Reset( + if (g_call_translator.IsEmpty()) + g_call_translator.Reset( isolate, - CreateFunctionTemplate(isolate, base::BindRepeating(&CallTranslater))); + CreateFunctionTemplate(isolate, base::BindRepeating(&CallTranslator))); - v8::Local call_translater = - v8::Local::New(isolate, g_call_translater); - auto* holder = new TranslaterHolder(isolate); - holder->translater = translater; + v8::Local call_translator = + v8::Local::New(isolate, g_call_translator); + auto* holder = new TranslatorHolder(isolate); + holder->translator = translator; auto state = gin::Dictionary::CreateEmpty(isolate); if (one_time) state.Set("oneTime", true); auto context = isolate->GetCurrentContext(); return BindFunctionWith( - isolate, context, call_translater->GetFunction(context).ToLocalChecked(), + isolate, context, call_translator->GetFunction(context).ToLocalChecked(), holder->handle.Get(isolate), gin::ConvertToV8(isolate, state)); } diff --git a/shell/common/gin_helper/callback.h b/shell/common/gin_helper/callback.h index 7187cc61db..2bd104d243 100644 --- a/shell/common/gin_helper/callback.h +++ b/shell/common/gin_helper/callback.h @@ -117,9 +117,9 @@ struct V8FunctionInvoker { }; // Helper to pass a C++ function to JavaScript. -using Translater = base::RepeatingCallback; -v8::Local CreateFunctionFromTranslater(v8::Isolate* isolate, - const Translater& translater, +using Translator = base::RepeatingCallback; +v8::Local CreateFunctionFromTranslator(v8::Isolate* isolate, + const Translator& translator, bool one_time); v8::Local BindFunctionWith(v8::Isolate* isolate, v8::Local context, @@ -149,9 +149,9 @@ template v8::Local CallbackToV8Leaked( v8::Isolate* isolate, const base::RepeatingCallback& val) { - Translater translater = + Translator translator = base::BindRepeating(&NativeFunctionInvoker::Go, val); - return CreateFunctionFromTranslater(isolate, translater, false); + return CreateFunctionFromTranslator(isolate, translator, false); } } // namespace gin_helper