diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-17 04:09:06 +0000 |
| commit | df0ca6c858762b101bf424ff6c0522409fa195fc (patch) | |
| tree | efa188eee6972e2c0de358f2d19a2348ce6dcb06 /chrome/browser/file_path_watcher_mac.cc | |
| parent | 73de26a684944782a92f8e6840e1b290c9a424cd (diff) | |
| download | chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.zip chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.gz chromium_src-df0ca6c858762b101bf424ff6c0522409fa195fc.tar.bz2 | |
Move scoped_cftyperef from base to base/mac, use the new namespace, and name it
properly (scoped_cftyperef -> ScopedCFTypeRef).
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/3855001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62887 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/file_path_watcher_mac.cc')
| -rw-r--r-- | chrome/browser/file_path_watcher_mac.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/file_path_watcher_mac.cc b/chrome/browser/file_path_watcher_mac.cc index ddcfd41..cc925a6 100644 --- a/chrome/browser/file_path_watcher_mac.cc +++ b/chrome/browser/file_path_watcher_mac.cc @@ -10,7 +10,7 @@ #include "base/file_path.h" #include "base/file_util.h" #include "base/logging.h" -#include "base/scoped_cftyperef.h" +#include "base/mac/scoped_cftyperef.h" #include "base/singleton.h" #include "base/time.h" @@ -187,12 +187,12 @@ void FilePathWatcherImpl::UpdateEventStream(FSEventStreamEventId start_event) { if (fsevent_stream_) DestroyEventStream(); - scoped_cftyperef<CFStringRef> cf_path(CFStringCreateWithCString( + base::mac::ScopedCFTypeRef<CFStringRef> cf_path(CFStringCreateWithCString( NULL, target_.value().c_str(), kCFStringEncodingMacHFS)); - scoped_cftyperef<CFStringRef> cf_dir_path(CFStringCreateWithCString( + base::mac::ScopedCFTypeRef<CFStringRef> cf_dir_path(CFStringCreateWithCString( NULL, target_.DirName().value().c_str(), kCFStringEncodingMacHFS)); CFStringRef paths_array[] = { cf_path.get(), cf_dir_path.get() }; - scoped_cftyperef<CFArrayRef> watched_paths(CFArrayCreate( + base::mac::ScopedCFTypeRef<CFArrayRef> watched_paths(CFArrayCreate( NULL, reinterpret_cast<const void**>(paths_array), arraysize(paths_array), &kCFTypeArrayCallBacks)); |