diff options
| author | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 04:29:10 +0000 |
|---|---|---|
| committer | dmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-03 04:29:10 +0000 |
| commit | 0c3bf9563dcd51310abbf9856db4aba416a664bf (patch) | |
| tree | 58393ab310ebe34e458f5725b2cae410ba1396f0 /chrome/browser/cocoa | |
| parent | 408292f44ad2b7087fae088ec10b1ad92470b4bd (diff) | |
| download | chromium_src-0c3bf9563dcd51310abbf9856db4aba416a664bf.zip chromium_src-0c3bf9563dcd51310abbf9856db4aba416a664bf.tar.gz chromium_src-0c3bf9563dcd51310abbf9856db4aba416a664bf.tar.bz2 | |
Clean up CF To NS Casts and make them slightly safer
Also adds streaming for CFStringRefs and CFErrorRefs making it
easier to add them to LOG() type statements.
BUG=NONE
TEST=BUILD
Review URL: http://codereview.chromium.org/6594096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76714 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/cocoa')
| -rw-r--r-- | chrome/browser/cocoa/install_from_dmg.mm | 4 | ||||
| -rw-r--r-- | chrome/browser/cocoa/keystone_glue.mm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/cocoa/install_from_dmg.mm b/chrome/browser/cocoa/install_from_dmg.mm index 8af44f3..1c56927 100644 --- a/chrome/browser/cocoa/install_from_dmg.mm +++ b/chrome/browser/cocoa/install_from_dmg.mm @@ -239,7 +239,7 @@ AuthorizationRef MaybeShowAuthorizationDialog(NSString* application_directory) { IDS_INSTALL_FROM_DMG_AUTHENTICATION_PROMPT, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); return authorization_util::AuthorizationCreateToRunAsRoot( - reinterpret_cast<CFStringRef>(prompt)); + base::mac::NSToCFCast(prompt)); } // Invokes the installer program at installer_path to copy source_path to @@ -339,7 +339,7 @@ bool LaunchInstalledApp(NSString* app_path) { struct LSApplicationParameters parameters = {0}; parameters.flags = kLSLaunchDefaults; parameters.application = &app_fsref; - parameters.argv = reinterpret_cast<CFArrayRef>(arguments); + parameters.argv = base::mac::NSToCFCast(arguments); err = LSOpenApplication(¶meters, NULL); if (err != noErr) { diff --git a/chrome/browser/cocoa/keystone_glue.mm b/chrome/browser/cocoa/keystone_glue.mm index 562d74a..8addcdb 100644 --- a/chrome/browser/cocoa/keystone_glue.mm +++ b/chrome/browser/cocoa/keystone_glue.mm @@ -757,7 +757,7 @@ NSString* const kBrandKey = @"KSBrandID"; l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)); scoped_AuthorizationRef authorization( authorization_util::AuthorizationCreateToRunAsRoot( - reinterpret_cast<CFStringRef>(prompt))); + base::mac::NSToCFCast(prompt))); if (!authorization.get()) { return; } |