| OLD | NEW |
| 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 #import "chrome/browser/mac/keystone_glue.h" | 5 #import "chrome/browser/mac/keystone_glue.h" |
| 6 | 6 |
| 7 #include <sys/mount.h> | 7 #include <sys/mount.h> |
| 8 #include <sys/param.h> | 8 #include <sys/param.h> |
| 9 #include <sys/stat.h> | 9 #include <sys/stat.h> |
| 10 | 10 |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 } | 90 } |
| 91 | 91 |
| 92 ~PerformBridge() {} | 92 ~PerformBridge() {} |
| 93 | 93 |
| 94 // Happens on a WorkerPool thread. | 94 // Happens on a WorkerPool thread. |
| 95 void Run() { | 95 void Run() { |
| 96 base::mac::ScopedNSAutoreleasePool pool; | 96 base::mac::ScopedNSAutoreleasePool pool; |
| 97 [target_ performSelector:sel_ withObject:arg_]; | 97 [target_ performSelector:sel_ withObject:arg_]; |
| 98 } | 98 } |
| 99 | 99 |
| 100 scoped_nsobject<id> target_; | 100 base::scoped_nsobject<id> target_; |
| 101 SEL sel_; | 101 SEL sel_; |
| 102 scoped_nsobject<id> arg_; | 102 base::scoped_nsobject<id> arg_; |
| 103 }; | 103 }; |
| 104 | 104 |
| 105 } // namespace | 105 } // namespace |
| 106 | 106 |
| 107 @interface KeystoneGlue (Private) | 107 @interface KeystoneGlue (Private) |
| 108 | 108 |
| 109 // Returns the path to the application's Info.plist file. This returns the | 109 // Returns the path to the application's Info.plist file. This returns the |
| 110 // outer application bundle's Info.plist, not the framework's Info.plist. | 110 // outer application bundle's Info.plist, not the framework's Info.plist. |
| 111 - (NSString*)appInfoPlistPath; | 111 - (NSString*)appInfoPlistPath; |
| 112 | 112 |
| (...skipping 905 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1018 return [KeystoneGlue defaultKeystoneGlue] != nil; | 1018 return [KeystoneGlue defaultKeystoneGlue] != nil; |
| 1019 } | 1019 } |
| 1020 | 1020 |
| 1021 string16 CurrentlyInstalledVersion() { | 1021 string16 CurrentlyInstalledVersion() { |
| 1022 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; | 1022 KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue]; |
| 1023 NSString* version = [keystoneGlue currentlyInstalledVersion]; | 1023 NSString* version = [keystoneGlue currentlyInstalledVersion]; |
| 1024 return base::SysNSStringToUTF16(version); | 1024 return base::SysNSStringToUTF16(version); |
| 1025 } | 1025 } |
| 1026 | 1026 |
| 1027 } // namespace keystone_glue | 1027 } // namespace keystone_glue |
| OLD | NEW |