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

Unified Diff: chrome/browser/mac/install_from_dmg.mm

Issue 9764013: Move authorization_util files into base/mac. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix license headers Created 8 years, 9 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
« no previous file with comments | « chrome/browser/mac/authorization_util.mm ('k') | chrome/browser/mac/keystone_glue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/mac/install_from_dmg.mm
diff --git a/chrome/browser/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm
index 1d11ecd84caf1d143e4c5679ae13dc575ea3000b..dc6bca411e7ae0028dcf2dea3bee9d8fc140c688 100644
--- a/chrome/browser/mac/install_from_dmg.mm
+++ b/chrome/browser/mac/install_from_dmg.mm
@@ -21,16 +21,16 @@
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/logging.h"
+#include "base/mac/authorization_util.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/mac_logging.h"
#import "base/mac/mac_util.h"
+#include "base/mac/scoped_authorizationref.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_nsautorelease_pool.h"
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
-#include "chrome/browser/mac/authorization_util.h"
#include "chrome/browser/mac/dock.h"
-#include "chrome/browser/mac/scoped_authorizationref.h"
#include "chrome/browser/mac/scoped_ioobject.h"
#import "chrome/browser/mac/keystone_glue.h"
#include "chrome/browser/mac/relauncher.h"
@@ -279,7 +279,7 @@ AuthorizationRef MaybeShowAuthorizationDialog(NSString* application_directory) {
NSString* prompt = l10n_util::GetNSStringFWithFixup(
IDS_INSTALL_FROM_DMG_AUTHENTICATION_PROMPT,
l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
- return authorization_util::AuthorizationCreateToRunAsRoot(
+ return base::mac::AuthorizationCreateToRunAsRoot(
base::mac::NSToCFCast(prompt));
}
@@ -292,7 +292,7 @@ bool InstallFromDiskImage(AuthorizationRef authorization_arg,
NSString* installer_path,
NSString* source_path,
NSString* target_path) {
- ScopedAuthorizationRef authorization(authorization_arg);
+ base::mac::ScopedAuthorizationRef authorization(authorization_arg);
authorization_arg = NULL;
int exit_status;
if (authorization) {
@@ -301,7 +301,7 @@ bool InstallFromDiskImage(AuthorizationRef authorization_arg,
const char* target_path_c = [target_path fileSystemRepresentation];
const char* arguments[] = {source_path_c, target_path_c, NULL};
- OSStatus status = authorization_util::ExecuteWithPrivilegesAndWait(
+ OSStatus status = base::mac::ExecuteWithPrivilegesAndWait(
authorization,
installer_path_c,
kAuthorizationFlagDefaults,
@@ -448,7 +448,7 @@ bool MaybeInstallFromDiskImage() {
return false;
}
- ScopedAuthorizationRef authorization(
+ base::mac::ScopedAuthorizationRef authorization(
MaybeShowAuthorizationDialog(application_directory));
// authorization will be NULL if it's deemed unnecessary or if
// authentication fails. In either case, try to install without privilege
« no previous file with comments | « chrome/browser/mac/authorization_util.mm ('k') | chrome/browser/mac/keystone_glue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698