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

Indenting stuff

Browse source
This commit is contained in:
Samuel Attard 2017-07-27 11:52:19 +10:00
parent ed717a9b45
commit f385e19594
4 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -53,6 +53,7 @@ void AutoUpdater::OnError(const std::string& message) {
GetWrapper(), GetWrapper(),
"error", "error",
error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(), error->ToObject(isolate()->GetCurrentContext()).ToLocalChecked(),
// Message is also emitted to keep compatibility with old code.
message); message);
} }
@ -89,8 +90,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, Emit("update-downloaded", release_notes, release_name, release_date, url,
url, base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this))); // Keep compatibility with old APIs.
base::Bind(&AutoUpdater::QuitAndInstall, base::Unretained(this)));
} }
void AutoUpdater::OnWindowAllClosed() { void AutoUpdater::OnWindowAllClosed() {

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

@ -32,8 +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, void OnError(const std::string& message, const int code,
const int code, const std::string& domain); const std::string& domain);
void OnCheckingForUpdate() override; void OnCheckingForUpdate() override;
void OnUpdateAvailable() override; void OnUpdateAvailable() override;
void OnUpdateNotAvailable() override; void OnUpdateNotAvailable() override;

4
atom/browser/auto_updater.h
View file

@ -22,8 +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, virtual void OnError(const std::string& error, const int code,
const int code, const std::string& domain) {} 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() {}

9
atom/browser/auto_updater_mac.mm
View file

@ -104,7 +104,8 @@ void AutoUpdater::CheckForUpdates() {
delegate->OnUpdateNotAvailable(); delegate->OnUpdateNotAvailable();
} }
} error:^(NSError *error) { } error:^(NSError *error) {
NSMutableString *failureString = [NSMutableString stringWithString:error.localizedDescription]; NSMutableString *failureString =
[NSMutableString stringWithString:error.localizedDescription];
if (error.localizedFailureReason) { if (error.localizedFailureReason) {
[failureString appendString:@": "]; [failureString appendString:@": "];
[failureString appendString:error.localizedFailureReason]; [failureString appendString:error.localizedFailureReason];
@ -115,7 +116,8 @@ void AutoUpdater::CheckForUpdates() {
[failureString appendString:@" "]; [failureString appendString:@" "];
[failureString appendString:error.localizedRecoverySuggestion]; [failureString appendString:error.localizedRecoverySuggestion];
} }
delegate->OnError(base::SysNSStringToUTF8(failureString), error.code, base::SysNSStringToUTF8(error.domain)); delegate->OnError(base::SysNSStringToUTF8(failureString), error.code,
base::SysNSStringToUTF8(error.domain));
}]; }];
} }
@ -124,7 +126,8 @@ void AutoUpdater::QuitAndInstall() {
if (g_update_available) { if (g_update_available) {
[[g_updater relaunchToInstallUpdate] subscribeError:^(NSError* error) { [[g_updater relaunchToInstallUpdate] subscribeError:^(NSError* error) {
if (delegate) if (delegate)
delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription), error.code, base::SysNSStringToUTF8(error.domain)); delegate->OnError(base::SysNSStringToUTF8(error.localizedDescription),
error.code, base::SysNSStringToUTF8(error.domain));
}]; }];
} else { } else {
if (delegate) if (delegate)