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

Unified Diff: chrome/browser/ui/cocoa/keystone_infobar_delegate.mm

Issue 334653006: mac: Prevent Address Book permissions dialog from erroneously appearing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: First. Created 6 years, 6 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
Index: chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
index 945b7efd27137307ffddfd362c6013d0c2720763..19a5274c3e82cc1b96ee1fd42f51eeab41c8d0b7 100644
--- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
+++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
@@ -180,9 +180,9 @@ bool KeystonePromotionInfoBarDelegate::ShouldExpireInternal(
// -updateStatus:.
[self retain];
- AutoupdateStatus recentStatus = [keystoneGlue recentStatus];
- if (recentStatus == kAutoupdateNone ||
- recentStatus == kAutoupdateRegistering) {
+ keystone_glue::AutoupdateStatus recentStatus = [keystoneGlue recentStatus];
+ if (recentStatus == keystone_glue::kAutoupdateNone ||
+ recentStatus == keystone_glue::kAutoupdateRegistering) {
NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
[center addObserver:self
selector:@selector(updateStatus:)
@@ -195,16 +195,18 @@ bool KeystonePromotionInfoBarDelegate::ShouldExpireInternal(
- (void)updateStatus:(NSNotification*)notification {
NSDictionary* dictionary = [notification userInfo];
- AutoupdateStatus status = static_cast<AutoupdateStatus>(
- [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
+ keystone_glue::AutoupdateStatus status =
+ static_cast<keystone_glue::AutoupdateStatus>(
+ [[dictionary objectForKey:kAutoupdateStatusStatus] intValue]);
- if (status == kAutoupdateNone || status == kAutoupdateRegistering) {
+ if (status == keystone_glue::kAutoupdateNone ||
+ status == keystone_glue::kAutoupdateRegistering) {
return;
}
[self removeObserver];
- if (status != kAutoupdateRegisterFailed &&
+ if (status != keystone_glue::kAutoupdateRegisterFailed &&
[[KeystoneGlue defaultKeystoneGlue] needsPromotion]) {
KeystonePromotionInfoBarDelegate::Create();
}

Powered by Google App Engine
This is Rietveld 408576698