diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-24 18:49:05 +0000 |
| commit | 3df79f4277938356ae3c7b3ecc25ab6165e8a899 (patch) | |
| tree | a1a39cd236c8800a13f2f3bf879d69505a2508de /base/mac | |
| parent | 8a15ea13737ae2f8444424fc14d1fcd5e42d5218 (diff) | |
| download | chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.zip chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.gz chromium_src-3df79f4277938356ae3c7b3ecc25ab6165e8a899.tar.bz2 | |
mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef.
This CL was created fully mechanically by running
git grep -l base::mac::ScopedCFTypeRef | xargs sed -i -e 's/base::mac::ScopedCFTypeRef/base::ScopedCFTypeRef/g'
git commit -a -m.
git clang-format HEAD^ --style=Chromium
git commit -a -m.
git cl upload -t $TITLE
BUG=251957
TBR=mark@chromium.org
Review URL: https://codereview.chromium.org/16917011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208245 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/mac')
| -rw-r--r-- | base/mac/foundation_util.mm | 5 | ||||
| -rw-r--r-- | base/mac/launch_services_util.cc | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm index 71e8942..1897b6f 100644 --- a/base/mac/foundation_util.mm +++ b/base/mac/foundation_util.mm @@ -383,9 +383,8 @@ std::ostream& operator<<(std::ostream& o, const CFStringRef string) { } std::ostream& operator<<(std::ostream& o, const CFErrorRef err) { - base::mac::ScopedCFTypeRef<CFStringRef> desc(CFErrorCopyDescription(err)); - base::mac::ScopedCFTypeRef<CFDictionaryRef> user_info( - CFErrorCopyUserInfo(err)); + base::ScopedCFTypeRef<CFStringRef> desc(CFErrorCopyDescription(err)); + base::ScopedCFTypeRef<CFDictionaryRef> user_info(CFErrorCopyUserInfo(err)); CFStringRef errorDesc = NULL; if (user_info.get()) { errorDesc = reinterpret_cast<CFStringRef>( diff --git a/base/mac/launch_services_util.cc b/base/mac/launch_services_util.cc index c24d864..0081500 100644 --- a/base/mac/launch_services_util.cc +++ b/base/mac/launch_services_util.cc @@ -25,7 +25,7 @@ bool OpenApplicationWithPath(const base::FilePath& bundle_path, std::vector<std::string> argv = command_line.argv(); int argc = argv.size(); - base::mac::ScopedCFTypeRef<CFMutableArrayRef> launch_args( + base::ScopedCFTypeRef<CFMutableArrayRef> launch_args( CFArrayCreateMutable(NULL, argc - 1, &kCFTypeArrayCallBacks)); if (!launch_args) { LOG(ERROR) << "CFArrayCreateMutable failed, size was " << argc; @@ -35,8 +35,7 @@ bool OpenApplicationWithPath(const base::FilePath& bundle_path, for (int i = 1; i < argc; ++i) { const std::string& arg(argv[i]); - base::mac::ScopedCFTypeRef<CFStringRef> arg_cf( - base::SysUTF8ToCFStringRef(arg)); + base::ScopedCFTypeRef<CFStringRef> arg_cf(base::SysUTF8ToCFStringRef(arg)); if (!arg_cf) { LOG(ERROR) << "base::SysUTF8ToCFStringRef failed for " << arg; return false; |