mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

appease the linter

Browse source
This commit is contained in:
Shelley Vohr 2017-07-26 18:29:10 -07:00
parent 919d7fa22e
commit 24ab5075e7
3 changed files with 77 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
atom/browser/api/atom_api_auto_updater.cc
View file

@ -52,20 +52,25 @@ void AutoUpdater::OnError(const std::string& message) {
isolate(), isolate(),
GetWrapper(), GetWrapper(),
"error", "error",
error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(), error->ToObject(
// Message is also emitted to keep compatibility with old code. isolate()->GetCurrentContext()).ToLocalChecked(),
message); message);
} }
void AutoUpdater::OnError(const std::string& message, const int code, const std::string& domain) { void AutoUpdater::OnError(const std::string& message,
const int code, const std::string& domain) {
v8::Locker locker(isolate()); v8::Locker locker(isolate());
v8::HandleScope handle_scope(isolate()); v8::HandleScope handle_scope(isolate());
auto error = v8::Exception::Error(mate::StringToV8(isolate(), message)); auto error = v8::Exception::Error(
auto errorObject = error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(); mate::StringToV8(isolate(), message));
auto errorObject = error->ToObject(
isolate()->GetCurrentContext()).ToLocalChecked();
// add two new params for better error handling // add two new params for better error handling
errorObject->Set(mate::StringToV8(isolate(), "code"), v8::Integer::New(isolate(), code)); errorObject->Set(mate::StringToV8(isolate(), "code"),
errorObject->Set(mate::StringToV8(isolate(), "domain"), mate::StringToV8(isolate(), domain)); v8::Integer::New(isolate(), code));
errorObject->Set(mate::StringToV8(isolate(), "domain"),
mate::StringToV8(isolate(), domain));
mate::EmitEvent( mate::EmitEvent(
isolate(), isolate(),
@ -91,9 +96,9 @@ void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
const std::string& release_name, const std::string& release_name,
const base::Time& release_date, const base::Time& release_date,
const std::string& url) { const std::string& url) {
Emit("update-downloaded", release_notes, release_name, release_date, url, Emit("update-downloaded", release_notes, release_name, release_date,
// Keep compatibility with old APIs. url, base::Bind(&AutoUpdater::QuitAndInstall,
base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this))); base::Unretained(this)));
} }
void AutoUpdater::OnWindowAllClosed() { void AutoUpdater::OnWindowAllClosed() {
@ -128,7 +133,8 @@ void AutoUpdater::BuildPrototype(
v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) { v8::Isolate* isolate, v8::Local<v8::FunctionTemplate> prototype) {
prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater")); prototype->SetClassName(mate::StringToV8(isolate, "AutoUpdater"));
mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate()) mate::ObjectTemplateBuilder(isolate, prototype->PrototypeTemplate())
.SetMethod("checkForUpdates", &auto_updater::AutoUpdater::CheckForUpdates) .SetMethod("checkForUpdates",
&auto_updater::AutoUpdater::CheckForUpdates)
.SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL) .SetMethod("getFeedURL", &auto_updater::AutoUpdater::GetFeedURL)
.SetMethod("setFeedURL", &AutoUpdater::SetFeedURL) .SetMethod("setFeedURL", &AutoUpdater::SetFeedURL)
.SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall); .SetMethod("quitAndInstall", &AutoUpdater::QuitAndInstall);
@ -148,7 +154,8 @@ void Initialize(v8::Local<v8::Object> exports, v8::Local<v8::Value> unused,
v8::Isolate* isolate = context->GetIsolate(); v8::Isolate* isolate = context->GetIsolate();
mate::Dictionary dict(isolate, exports); mate::Dictionary dict(isolate, exports);
dict.Set("autoUpdater", AutoUpdater::Create(isolate)); dict.Set("autoUpdater", AutoUpdater::Create(isolate));
dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction()); dict.Set("AutoUpdater",
AutoUpdater::GetConstructor(isolate)->GetFunction());
} }
} // namespace } // namespace

3
atom/browser/api/atom_api_auto_updater.h
View file

@ -32,7 +32,8 @@ class AutoUpdater : public mate::EventEmitter<AutoUpdater>,
// Delegate implementations. // Delegate implementations.
void OnError(const std::string& error) override; 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 OnCheckingForUpdate() override;
void OnUpdateAvailable() override; void OnUpdateAvailable() override;
void OnUpdateNotAvailable() override; void OnUpdateNotAvailable() override;

3
atom/browser/auto_updater.h
View file

@ -22,7 +22,8 @@ class Delegate {
// An error happened. // An error happened.
virtual void OnError(const std::string& error) {} 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 // Checking to see if there is an update
virtual void OnCheckingForUpdate() {} virtual void OnCheckingForUpdate() {}