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

Remove references to Sparkle

Browse source
This commit is contained in:
probablycorey 2014-01-20 16:22:49 -08:00
parent 5741bad918
commit 2a7244a366
1 changed files with 49 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
browser/auto_updater_mac.mm
View file

@ -4,9 +4,7 @@
#include "browser/auto_updater.h"
// Sparkle's headers are throwing compilation warnings, supress them.
#pragma GCC diagnostic ignored "-Wmissing-method-return-type"
#import <Sparkle/Sparkle.h>
#import <Squirrel/Squirrel.h>
#include "base/bind.h"
#include "base/memory/scoped_ptr.h"
@ -28,82 +26,82 @@ typedef scoped_ptr<NSInvocation, NSInvocationDeleter> ScopedNSInvocation;
// We are passing the NSInvocation as scoped_ptr, because we want to make sure
// whether or not the callback is called, the NSInvocation should always be
// released, the only way to ensure it is to use scoped_ptr.
void CallNSInvocation(ScopedNSInvocation invocation) {
[invocation.get() invoke];
}
// void CallNSInvocation(ScopedNSInvocation invocation) {
// [invocation.get() invoke];
// }
} // namespace
@interface SUUpdaterDelegate : NSObject {
}
@end
@implementation SUUpdaterDelegate
- (BOOL)updater:(SUUpdater*)updater
shouldPostponeRelaunchForUpdate:(SUAppcastItem*)update
untilInvoking:(NSInvocation*)invocation {
AutoUpdaterDelegate* delegate = auto_updater::AutoUpdater::GetDelegate();
if (!delegate)
return NO;
std::string version(base::SysNSStringToUTF8([update versionString]));
ScopedNSInvocation invocation_ptr([invocation retain]);
delegate->WillInstallUpdate(
version,
base::Bind(&CallNSInvocation, base::Passed(invocation_ptr.Pass())));
return YES;
}
- (void)updater:(SUUpdater*)updater
willInstallUpdateOnQuit:(SUAppcastItem*)update
immediateInstallationInvocation:(NSInvocation*)invocation {
AutoUpdaterDelegate* delegate = auto_updater::AutoUpdater::GetDelegate();
if (!delegate)
return;
std::string version(base::SysNSStringToUTF8([update versionString]));
ScopedNSInvocation invocation_ptr([invocation retain]);
delegate->ReadyForUpdateOnQuit(
version,
base::Bind(&CallNSInvocation, base::Passed(invocation_ptr.Pass())));
}
@end
// @interface SUUpdaterDelegate : NSObject {
// }
// @end
//
// @implementation SUUpdaterDelegate
//
// - (BOOL)updater:(SUUpdater*)updater
// shouldPostponeRelaunchForUpdate:(SUAppcastItem*)update
// untilInvoking:(NSInvocation*)invocation {
// AutoUpdaterDelegate* delegate = auto_updater::AutoUpdater::GetDelegate();
// if (!delegate)
// return NO;
//
// std::string version(base::SysNSStringToUTF8([update versionString]));
// ScopedNSInvocation invocation_ptr([invocation retain]);
// delegate->WillInstallUpdate(
// version,
// base::Bind(&CallNSInvocation, base::Passed(invocation_ptr.Pass())));
//
// return YES;
// }
//
// - (void)updater:(SUUpdater*)updater
// willInstallUpdateOnQuit:(SUAppcastItem*)update
// immediateInstallationInvocation:(NSInvocation*)invocation {
// AutoUpdaterDelegate* delegate = auto_updater::AutoUpdater::GetDelegate();
// if (!delegate)
// return;
//
// std::string version(base::SysNSStringToUTF8([update versionString]));
// ScopedNSInvocation invocation_ptr([invocation retain]);
// delegate->ReadyForUpdateOnQuit(
// version,
// base::Bind(&CallNSInvocation, base::Passed(invocation_ptr.Pass())));
// }
//
// @end
namespace auto_updater {
// static
void AutoUpdater::Init() {
SUUpdaterDelegate* delegate = [[SUUpdaterDelegate alloc] init];
[[SUUpdater sharedUpdater] setDelegate:delegate];
// SUUpdaterDelegate* delegate = [[SUUpdaterDelegate alloc] init];
// [[SUUpdater sharedUpdater] setDelegate:delegate];
}
// static
void AutoUpdater::SetFeedURL(const std::string& url) {
NSString* url_str(base::SysUTF8ToNSString(url));
[[SUUpdater sharedUpdater] setFeedURL:[NSURL URLWithString:url_str]];
// NSString* url_str(base::SysUTF8ToNSString(url));
// [[SUUpdater sharedUpdater] setFeedURL:[NSURL URLWithString:url_str]];
}
// static
void AutoUpdater::SetAutomaticallyChecksForUpdates(bool yes) {
[[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates:yes];
// [[SUUpdater sharedUpdater] setAutomaticallyChecksForUpdates:yes];
}
// static
void AutoUpdater::SetAutomaticallyDownloadsUpdates(bool yes) {
[[SUUpdater sharedUpdater] setAutomaticallyDownloadsUpdates:yes];
// [[SUUpdater sharedUpdater] setAutomaticallyDownloadsUpdates:yes];
}
// static
void AutoUpdater::CheckForUpdates() {
[[SUUpdater sharedUpdater] checkForUpdates:nil];
// [[SUUpdater sharedUpdater] checkForUpdates:nil];
}
// static
void AutoUpdater::CheckForUpdatesInBackground() {
[[SUUpdater sharedUpdater] checkForUpdatesInBackground];
// [[SUUpdater sharedUpdater] checkForUpdatesInBackground];
}
} // namespace auto_updater