From 24ab5075e7640e932c9ffc62080831062f89ef91 Mon Sep 17 00:00:00 2001 From: Shelley Vohr Date: Wed, 26 Jul 2017 18:29:10 -0700 Subject: [PATCH] appease the linter --- atom/browser/api/atom_api_auto_updater.cc | 139 ++++++++++++---------- atom/browser/api/atom_api_auto_updater.h | 3 +- atom/browser/auto_updater.h | 3 +- 3 files changed, 77 insertions(+), 68 deletions(-) diff --git a/atom/browser/api/atom_api_auto_updater.cc b/atom/browser/api/atom_api_auto_updater.cc index 427588a2aeab..40ba44e73de4 100644 --- a/atom/browser/api/atom_api_auto_updater.cc +++ b/atom/browser/api/atom_api_auto_updater.cc @@ -18,15 +18,15 @@ namespace mate { template<> struct Converter { - static v8::Local ToV8(v8::Isolate* isolate, - const base::Time& val) { - v8::MaybeLocal date = v8::Date::New( - isolate->GetCurrentContext(), val.ToJsTime()); - if (date.IsEmpty()) - return v8::Null(isolate); - else - return date.ToLocalChecked(); - } + static v8::Local ToV8(v8::Isolate* isolate, + const base::Time& val) { + v8::MaybeLocal date = v8::Date::New( + isolate->GetCurrentContext(), val.ToJsTime()); + if (date.IsEmpty()) + return v8::Null(isolate); + else + return date.ToLocalChecked(); + } }; } // namespace mate @@ -36,102 +36,108 @@ namespace atom { namespace api { AutoUpdater::AutoUpdater(v8::Isolate* isolate) { - auto_updater::AutoUpdater::SetDelegate(this); - Init(isolate); + auto_updater::AutoUpdater::SetDelegate(this); + Init(isolate); } AutoUpdater::~AutoUpdater() { - auto_updater::AutoUpdater::SetDelegate(nullptr); + auto_updater::AutoUpdater::SetDelegate(nullptr); } void AutoUpdater::OnError(const std::string& message) { - v8::Locker locker(isolate()); - v8::HandleScope handle_scope(isolate()); - auto error = v8::Exception::Error(mate::StringToV8(isolate(), message)); - mate::EmitEvent( - isolate(), - GetWrapper(), - "error", - error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(), - // Message is also emitted to keep compatibility with old code. - message); + v8::Locker locker(isolate()); + v8::HandleScope handle_scope(isolate()); + auto error = v8::Exception::Error(mate::StringToV8(isolate(), message)); + mate::EmitEvent( + isolate(), + GetWrapper(), + "error", + error->ToObject( + isolate()->GetCurrentContext()).ToLocalChecked(), + message); } -void AutoUpdater::OnError(const std::string& message, const int code, const std::string& domain) { - v8::Locker locker(isolate()); - v8::HandleScope handle_scope(isolate()); - auto error = v8::Exception::Error(mate::StringToV8(isolate(), message)); - auto errorObject = error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(); +void AutoUpdater::OnError(const std::string& message, + const int code, const std::string& domain) { + v8::Locker locker(isolate()); + v8::HandleScope handle_scope(isolate()); + auto error = v8::Exception::Error( + mate::StringToV8(isolate(), message)); + auto errorObject = error->ToObject( + isolate()->GetCurrentContext()).ToLocalChecked(); - // add two new params for better error handling - errorObject->Set(mate::StringToV8(isolate(), "code"), v8::Integer::New(isolate(), code)); - errorObject->Set(mate::StringToV8(isolate(), "domain"), mate::StringToV8(isolate(), domain)); + // add two new params for better error handling + errorObject->Set(mate::StringToV8(isolate(), "code"), + v8::Integer::New(isolate(), code)); + errorObject->Set(mate::StringToV8(isolate(), "domain"), + mate::StringToV8(isolate(), domain)); - mate::EmitEvent( - isolate(), - GetWrapper(), - "error", - errorObject, - message); + mate::EmitEvent( + isolate(), + GetWrapper(), + "error", + errorObject, + message); } void AutoUpdater::OnCheckingForUpdate() { - Emit("checking-for-update"); + Emit("checking-for-update"); } void AutoUpdater::OnUpdateAvailable() { - Emit("update-available"); + Emit("update-available"); } void AutoUpdater::OnUpdateNotAvailable() { - Emit("update-not-available"); + Emit("update-not-available"); } void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes, const std::string& release_name, const base::Time& release_date, const std::string& url) { - Emit("update-downloaded", release_notes, release_name, release_date, url, - // Keep compatibility with old APIs. - base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this))); + Emit("update-downloaded", release_notes, release_name, release_date, + url, base::Bind(&AutoUpdater::QuitAndInstall, + base::Unretained(this))); } void AutoUpdater::OnWindowAllClosed() { - QuitAndInstall(); + QuitAndInstall(); } void AutoUpdater::SetFeedURL(const std::string& url, mate::Arguments* args) { - auto_updater::AutoUpdater::HeaderMap headers; - args->GetNext(&headers); - auto_updater::AutoUpdater::SetFeedURL(url, headers); + auto_updater::AutoUpdater::HeaderMap headers; + args->GetNext(&headers); + auto_updater::AutoUpdater::SetFeedURL(url, headers); } void AutoUpdater::QuitAndInstall() { - // If we don't have any window then quitAndInstall immediately. - if (WindowList::IsEmpty()) { - auto_updater::AutoUpdater::QuitAndInstall(); - return; - } + // If we don't have any window then quitAndInstall immediately. + if (WindowList::IsEmpty()) { + auto_updater::AutoUpdater::QuitAndInstall(); + return; + } - // Otherwise do the restart after all windows have been closed. - WindowList::AddObserver(this); - WindowList::CloseAllWindows(); + // Otherwise do the restart after all windows have been closed. + WindowList::AddObserver(this); + WindowList::CloseAllWindows(); } // static mate::Handle AutoUpdater::Create(v8::Isolate* isolate) { - return mate::CreateHandle(isolate, new AutoUpdater(isolate)); + return mate::CreateHandle(isolate, new AutoUpdater(isolate)); } // static void AutoUpdater::BuildPrototype( - v8::Isolate* isolate, v8::Local prototype) { - prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater")); - mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate()) - .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates) - .SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL) - .SetMethod("setFeedURL", &AutoUpdater::SetFeedURL) - .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall); + v8::Isolate* isolate, v8::Local prototype) { + prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater")); + mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate()) + .SetMethod("checkForUpdates", + &auto_updater::AutoUpdater::CheckForUpdates) + .SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL) + .SetMethod("setFeedURL", &AutoUpdater::SetFeedURL) + .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall); } } // namespace api @@ -145,10 +151,11 @@ using atom::api::AutoUpdater; void Initialize(v8::Local exports, v8::Local unused, v8::Local context, void* priv) { - v8::Isolate* isolate = context->GetIsolate(); - mate::Dictionary dict(isolate, exports); - dict.Set("autoUpdater", AutoUpdater::Create(isolate)); - dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction()); + v8::Isolate* isolate = context->GetIsolate(); + mate::Dictionary dict(isolate, exports); + dict.Set("autoUpdater", AutoUpdater::Create(isolate)); + dict.Set("AutoUpdater", + AutoUpdater::GetConstructor(isolate)->GetFunction()); } } // namespace diff --git a/atom/browser/api/atom_api_auto_updater.h b/atom/browser/api/atom_api_auto_updater.h index 1b522e334c6e..9f708e3e6c3b 100644 --- a/atom/browser/api/atom_api_auto_updater.h +++ b/atom/browser/api/atom_api_auto_updater.h @@ -32,7 +32,8 @@ class AutoUpdater : public mate::EventEmitter, // Delegate implementations. void OnError(const std::string& error) override; - void OnError(const std::string& message, const int code, const std::string& domain); + void OnError(const std::string& message, + const int code, const std::string& domain); void OnCheckingForUpdate() override; void OnUpdateAvailable() override; void OnUpdateNotAvailable() override; diff --git a/atom/browser/auto_updater.h b/atom/browser/auto_updater.h index f70ed986c5a3..e5f6a44dad02 100644 --- a/atom/browser/auto_updater.h +++ b/atom/browser/auto_updater.h @@ -22,7 +22,8 @@ class Delegate { // An error happened. virtual void OnError(const std::string& error) {} - virtual void OnError(const std::string& error, const int code, const std::string& domain) {} + virtual void OnError(const std::string& error, + const int code, const std::string& domain) {} // Checking to see if there is an update virtual void OnCheckingForUpdate() {}