diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 22:32:58 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-27 22:32:58 +0000 |
| commit | 02b1f02b8161a6ffb006ff3e21cd7e78e3f5f6ad (patch) | |
| tree | a99e2585585af9a844d4405d9bec1cc6a21d0e26 | |
| parent | 6f59d5995c1ef9e687d1a38ee75697989581aba2 (diff) | |
| download | chromium_src-02b1f02b8161a6ffb006ff3e21cd7e78e3f5f6ad.zip chromium_src-02b1f02b8161a6ffb006ff3e21cd7e78e3f5f6ad.tar.gz chromium_src-02b1f02b8161a6ffb006ff3e21cd7e78e3f5f6ad.tar.bz2 | |
KSR should always support the new registration API now.
BUG=24814
TEST=Keystone-enabled Chrome launches without crashing and is able to check
for and install updates.
Review URL: http://codereview.chromium.org/329041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30267 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/keystone_glue.mm | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/chrome/app/keystone_glue.mm b/chrome/app/keystone_glue.mm index 120b59a..2cba7e6 100644 --- a/chrome/app/keystone_glue.mm +++ b/chrome/app/keystone_glue.mm @@ -35,12 +35,6 @@ NSString *KSRegistrationRemoveExistingTag = @""; + (id)registrationWithProductID:(NSString*)productID; -// Older API -- (BOOL)registerWithVersion:(NSString*)version - existenceCheckerType:(KSExistenceCheckerType)xctype - existenceCheckerString:(NSString*)xc - serverURLString:(NSString*)serverURLString; -// Newer API - (BOOL)registerWithVersion:(NSString*)version existenceCheckerType:(KSExistenceCheckerType)xctype existenceCheckerString:(NSString*)xc @@ -201,24 +195,12 @@ static KeystoneGlue* sDefaultKeystoneGlue = nil; // leaked // The existence checks should use the path to the app bundle, not the // app framework bundle, so use [NSBundle mainBundle] instead of // mac_util::MainBundle(). - // - // Only use new API if we can. This lets us land the new call - // before the new Keystone has been released. - // - // TODO(jrg): once we hit Beta and the new Keystone is released, - // make this call unconditional. - if ([registration_ respondsToSelector:@selector(registerWithVersion:existenceCheckerType:existenceCheckerString:serverURLString:preserveTTToken:tag:)]) - [registration_ registerWithVersion:version_ - existenceCheckerType:kKSPathExistenceChecker - existenceCheckerString:[[NSBundle mainBundle] bundlePath] - serverURLString:url_ - preserveTTToken:YES - tag:channel_]; - else - [registration_ registerWithVersion:version_ - existenceCheckerType:kKSPathExistenceChecker - existenceCheckerString:[[NSBundle mainBundle] bundlePath] - serverURLString:url_]; + [registration_ registerWithVersion:version_ + existenceCheckerType:kKSPathExistenceChecker + existenceCheckerString:[[NSBundle mainBundle] bundlePath] + serverURLString:url_ + preserveTTToken:YES + tag:channel_]; // Mark an active RIGHT NOW; don't wait an hour for the first one. [registration_ setActive]; |