Index: base/mac/mac_util.mm |
diff --git a/base/mac/mac_util.mm b/base/mac/mac_util.mm |
index e924f9021da361ef1992663575c2ceea7b38460f..04311ecf11ec0cb09e38eb02d90a3374bab726fb 100644 |
--- a/base/mac/mac_util.mm |
+++ b/base/mac/mac_util.mm |
@@ -19,7 +19,7 @@ |
#include "base/mac/mac_logging.h" |
#include "base/mac/scoped_cftyperef.h" |
#include "base/mac/scoped_ioobject.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_piece.h" |
#include "base/strings/sys_string_conversions.h" |
@@ -99,7 +99,7 @@ LSSharedFileListItemRef GetLoginItemForApp() { |
return NULL; |
} |
- scoped_nsobject<NSArray> login_items_array( |
+ base::scoped_nsobject<NSArray> login_items_array( |
CFToNSCast(LSSharedFileListCopySnapshot(login_items, NULL))); |
NSURL* url = [NSURL fileURLWithPath:[base::mac::MainBundle() bundlePath]]; |
@@ -489,17 +489,17 @@ void RemoveFromLoginItems() { |
bool WasLaunchedAsLoginOrResumeItem() { |
ProcessSerialNumber psn = { 0, kCurrentProcess }; |
- scoped_nsobject<NSDictionary> process_info( |
- CFToNSCast(ProcessInformationCopyDictionary(&psn, |
- kProcessDictionaryIncludeAllInformationMask))); |
+ base::scoped_nsobject<NSDictionary> process_info( |
+ CFToNSCast(ProcessInformationCopyDictionary( |
+ &psn, kProcessDictionaryIncludeAllInformationMask))); |
long long temp = [[process_info objectForKey:@"ParentPSN"] longLongValue]; |
ProcessSerialNumber parent_psn = |
{ (temp >> 32) & 0x00000000FFFFFFFFLL, temp & 0x00000000FFFFFFFFLL }; |
- scoped_nsobject<NSDictionary> parent_info( |
- CFToNSCast(ProcessInformationCopyDictionary(&parent_psn, |
- kProcessDictionaryIncludeAllInformationMask))); |
+ base::scoped_nsobject<NSDictionary> parent_info( |
+ CFToNSCast(ProcessInformationCopyDictionary( |
+ &parent_psn, kProcessDictionaryIncludeAllInformationMask))); |
// Check that creator process code is that of loginwindow. |
BOOL result = |