Commit 02b1f02b authored by mark@chromium.org's avatar mark@chromium.org

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
parent 6f59d599
...@@ -35,12 +35,6 @@ NSString *KSRegistrationRemoveExistingTag = @""; ...@@ -35,12 +35,6 @@ NSString *KSRegistrationRemoveExistingTag = @"";
+ (id)registrationWithProductID:(NSString*)productID; + (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 - (BOOL)registerWithVersion:(NSString*)version
existenceCheckerType:(KSExistenceCheckerType)xctype existenceCheckerType:(KSExistenceCheckerType)xctype
existenceCheckerString:(NSString*)xc existenceCheckerString:(NSString*)xc
...@@ -201,24 +195,12 @@ static KeystoneGlue* sDefaultKeystoneGlue = nil; // leaked ...@@ -201,24 +195,12 @@ static KeystoneGlue* sDefaultKeystoneGlue = nil; // leaked
// The existence checks should use the path to the app bundle, not the // The existence checks should use the path to the app bundle, not the
// app framework bundle, so use [NSBundle mainBundle] instead of // app framework bundle, so use [NSBundle mainBundle] instead of
// mac_util::MainBundle(). // mac_util::MainBundle().
// [registration_ registerWithVersion:version_
// Only use new API if we can. This lets us land the new call existenceCheckerType:kKSPathExistenceChecker
// before the new Keystone has been released. existenceCheckerString:[[NSBundle mainBundle] bundlePath]
// serverURLString:url_
// TODO(jrg): once we hit Beta and the new Keystone is released, preserveTTToken:YES
// make this call unconditional. tag:channel_];
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_];
// Mark an active RIGHT NOW; don't wait an hour for the first one. // Mark an active RIGHT NOW; don't wait an hour for the first one.
[registration_ setActive]; [registration_ setActive];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment