Commit 186f0c58 authored by Mark Mentovai's avatar Mark Mentovai

Update KeystoneRegistration.framework to 1.2.0.7671.

The big change in this version is that an installation attempt initiated
by the application can show up as ondemand on the server. This will
allow us to provide throttled Mac downloads (such as a "5% push") with
correct behavior.

A previous registration framework, 1.2.0.6782, intended to fix this bug
was backed out (via DEPS) because it was not compatible with older
installed Keystones. This version contains a fix for that problem.

Another previous registration framework, 1.2.0.7407, was backed out
because it contained bugs in its installer.

Previous commit: r245361, https://codereview.chromium.org/141193002
Backed out: r245603, https://codereview.chromium.org/141583005
Tried again: r261532, https://codereview.chromium.org/212703006
Backed out: r262037, https://codereview.chromium.org/227173002

BUG=35495
R=oemilyo@chromium.org

Review URL: https://codereview.chromium.org/577353006

Cr-Commit-Position: refs/heads/master@{#296130}
parent 6a0f0781
......@@ -555,7 +555,11 @@ NSString* const kVersionKey = @"KSVersion";
[self updateStatus:kAutoupdateChecking version:nil];
[registration_ checkForUpdate];
// All checks from inside Chrome are considered user-initiated, because they
// only happen following a user action, such as visiting the about page.
// Non-user-initiated checks are the periodic checks automatically made by
// Keystone, which don't come through this code path (or even this process).
[registration_ checkForUpdateWasUserInitiated:YES];
// Upon completion, ksr::KSRegistrationCheckForUpdateNotification will be
// posted, and -checkForUpdateComplete: will be called.
......
......@@ -35,10 +35,11 @@ namespace ksr = keystone_registration;
return NO;
}
- (void)setActive {
- (BOOL)setActive {
return NO;
}
- (void)checkForUpdate {
- (void)checkForUpdateWasUserInitiated:(BOOL)userInitiated {
}
- (void)startUpdate {
......@@ -55,7 +56,7 @@ namespace ksr = keystone_registration;
// Send the notifications that a real KeystoneGlue object would send.
- (void)checkForUpdate {
- (void)checkForUpdateWasUserInitiated:(BOOL)userInitiated {
NSNumber* yesNumber = [NSNumber numberWithBool:YES];
NSString* statusKey = @"Status";
NSDictionary* dictionary = [NSDictionary dictionaryWithObject:yesNumber
......
......@@ -61,8 +61,8 @@ extern NSString* KSRegistrationRemoveExistingTag;
- (BOOL)promoteWithParameters:(NSDictionary*)args
authorization:(AuthorizationRef)authorization;
- (void)setActive;
- (void)checkForUpdate;
- (BOOL)setActive;
- (void)checkForUpdateWasUserInitiated:(BOOL)userInitiated;
- (void)startUpdate;
- (keystone_registration::KSRegistrationTicketType)ticketType;
......
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