Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1612)

Unified Diff: chrome/app/keystone_glue.mm

Issue 329041: KSR should always support the new registration API now (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/keystone_glue.mm
===================================================================
--- chrome/app/keystone_glue.mm (revision 30249)
+++ chrome/app/keystone_glue.mm (working copy)
@@ -35,15 +35,9 @@
+ (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
serverURLString:(NSString*)serverURLString
preserveTTToken:(BOOL)preserveToken
tag:(NSString*)tag;
@@ -201,24 +195,12 @@
// 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];
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698