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

Side by Side Diff: chrome/browser/mac/keystone_glue.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_ 5 #ifndef CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
6 #define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_ 6 #define CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
7 7
8 #include "base/strings/string16.h" 8 #include "base/strings/string16.h"
9 9
10 #if defined(__OBJC__) 10 #if defined(__OBJC__)
11 11
12 #import <Foundation/Foundation.h> 12 #import <Foundation/Foundation.h>
13 13
14 #include "base/mac/scoped_authorizationref.h" 14 #include "base/mac/scoped_authorizationref.h"
15 #import "base/memory/scoped_nsobject.h" 15 #import "base/mac/scoped_nsobject.h"
16 16
17 // Possible outcomes of various operations. A version may accompany some of 17 // Possible outcomes of various operations. A version may accompany some of
18 // these, but beware: a version is never required. For statuses that can be 18 // these, but beware: a version is never required. For statuses that can be
19 // accompanied by a version, the comment indicates what version is referenced. 19 // accompanied by a version, the comment indicates what version is referenced.
20 // A notification posted containing an asynchronous status will always be 20 // A notification posted containing an asynchronous status will always be
21 // followed by a notification with a terminal status. 21 // followed by a notification with a terminal status.
22 enum AutoupdateStatus { 22 enum AutoupdateStatus {
23 kAutoupdateNone = 0, // no version (initial state only) 23 kAutoupdateNone = 0, // no version (initial state only)
24 kAutoupdateRegistering, // no version (asynchronous operation in progress) 24 kAutoupdateRegistering, // no version (asynchronous operation in progress)
25 kAutoupdateRegistered, // no version 25 kAutoupdateRegistered, // no version
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 NSString* url_; 82 NSString* url_;
83 NSString* version_; 83 NSString* version_;
84 NSString* channel_; // Logically: Dev, Beta, or Stable. 84 NSString* channel_; // Logically: Dev, Beta, or Stable.
85 BrandFileType brandFileType_; 85 BrandFileType brandFileType_;
86 86
87 // And the Keystone registration itself, with the active timer 87 // And the Keystone registration itself, with the active timer
88 KSRegistration* registration_; // strong 88 KSRegistration* registration_; // strong
89 NSTimer* timer_; // strong 89 NSTimer* timer_; // strong
90 90
91 // The most recent kAutoupdateStatusNotification notification posted. 91 // The most recent kAutoupdateStatusNotification notification posted.
92 scoped_nsobject<NSNotification> recentNotification_; 92 base::scoped_nsobject<NSNotification> recentNotification_;
93 93
94 // The authorization object, when it needs to persist because it's being 94 // The authorization object, when it needs to persist because it's being
95 // carried across threads. 95 // carried across threads.
96 base::mac::ScopedAuthorizationRef authorization_; 96 base::mac::ScopedAuthorizationRef authorization_;
97 97
98 // YES if a synchronous promotion operation is in progress (promotion during 98 // YES if a synchronous promotion operation is in progress (promotion during
99 // installation). 99 // installation).
100 BOOL synchronousPromotion_; 100 BOOL synchronousPromotion_;
101 101
102 // YES if an update was ever successfully installed by -installUpdate. 102 // YES if an update was ever successfully installed by -installUpdate.
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 205
206 // True if Keystone is enabled. 206 // True if Keystone is enabled.
207 bool KeystoneEnabled(); 207 bool KeystoneEnabled();
208 208
209 // The version of the application currently installed on disk. 209 // The version of the application currently installed on disk.
210 string16 CurrentlyInstalledVersion(); 210 string16 CurrentlyInstalledVersion();
211 211
212 } // namespace keystone_glue 212 } // namespace keystone_glue
213 213
214 #endif // CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_ 214 #endif // CHROME_BROWSER_MAC_KEYSTONE_GLUE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698