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

revert accidental overbeautification

Browse source
This commit is contained in:
Shelley Vohr 2017-07-26 18:41:25 -07:00
parent 24ab5075e7
commit ed717a9b45
1 changed files with 60 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,8 +52,7 @@ void AutoUpdater::OnError(const std::string& message) {
isolate(), isolate(),
GetWrapper(), GetWrapper(),
"error", "error",
error->ToObject( error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(),
isolate()->GetCurrentContext()).ToLocalChecked(),
message); message);
} }
@ -61,8 +60,7 @@ void AutoUpdater::OnError(const std::string& message,
const int code, const std::string& domain) { 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( auto error = v8::Exception::Error(mate::StringToV8(isolate(), message));
mate::StringToV8(isolate(), message));
auto errorObject = error->ToObject( auto errorObject = error->ToObject(
isolate()->GetCurrentContext()).ToLocalChecked(); isolate()->GetCurrentContext()).ToLocalChecked();
@ -72,12 +70,7 @@ void AutoUpdater::OnError(const std::string& message,
errorObject->Set(mate::StringToV8(isolate(), "domain"), errorObject->Set(mate::StringToV8(isolate(), "domain"),
mate::StringToV8(isolate(), domain)); mate::StringToV8(isolate(), domain));
mate::EmitEvent( mate::EmitEvent(isolate(), GetWrapper(), "error", errorObject, message);
isolate(),
GetWrapper(),
"error",
errorObject,
message);
} }
void AutoUpdater::OnCheckingForUpdate() { void AutoUpdater::OnCheckingForUpdate() {
@ -97,8 +90,7 @@ void AutoUpdater::OnUpdateDownloaded(const std::string& release_notes,
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, Emit("update-downloaded", release_notes, release_name, release_date,
url, base::Bind(&AutoUpdater::QuitAndInstall, url, base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
base::Unretained(this)));
} }
void AutoUpdater::OnWindowAllClosed() { void AutoUpdater::OnWindowAllClosed() {
@ -133,8 +125,7 @@ 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", .SetMethod("checkForUpdates", &auto_updater::AutoUpdater::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);
@ -154,8 +145,7 @@ 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", dict.Set("AutoUpdater", AutoUpdater::GetConstructor(isolate)->GetFunction());
AutoUpdater::GetConstructor(isolate)->GetFunction());
} }
} // namespace } // namespace