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

Unified Diff: ui/shell_dialogs/select_file_dialog_mac.mm

Issue 16917011: mac: Replace base::mac::ScopedCFTypeRef with base::ScopedCFTypeRef. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: with fixed off-by-1 in git-clang-format Created 7 years, 6 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 | « ui/gfx/render_text_mac.cc ('k') | ui/snapshot/snapshot_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/shell_dialogs/select_file_dialog_mac.mm
diff --git a/ui/shell_dialogs/select_file_dialog_mac.mm b/ui/shell_dialogs/select_file_dialog_mac.mm
index 8c1ffa332b2235a1f7d6a61fb66a26c6fb797f5c..889376207e57cb414ed1a6c87605a2b352c1755e 100644
--- a/ui/shell_dialogs/select_file_dialog_mac.mm
+++ b/ui/shell_dialogs/select_file_dialog_mac.mm
@@ -29,8 +29,7 @@ namespace {
const int kFileTypePopupTag = 1234;
CFStringRef CreateUTIFromExtension(const base::FilePath::StringType& ext) {
- base::mac::ScopedCFTypeRef<CFStringRef> ext_cf(
- base::SysUTF8ToCFStringRef(ext));
+ base::ScopedCFTypeRef<CFStringRef> ext_cf(base::SysUTF8ToCFStringRef(ext));
return UTTypeCreatePreferredIdentifierForTag(
kUTTagClassFilenameExtension, ext_cf.get(), NULL);
}
@@ -226,7 +225,7 @@ void SelectFileDialogImpl::SelectFileImpl(
const std::vector<base::FilePath::StringType>& ext_list =
file_types->extensions[i];
for (size_t j = 0; j < ext_list.size(); ++j) {
- base::mac::ScopedCFTypeRef<CFStringRef> uti(
+ base::ScopedCFTypeRef<CFStringRef> uti(
CreateUTIFromExtension(ext_list[j]));
[file_type_set addObject:base::mac::CFToNSCast(uti.get())];
@@ -234,7 +233,7 @@ void SelectFileDialogImpl::SelectFileImpl(
// back to the original extension correctly. This occurs with dynamic
// UTIs on 10.7 and 10.8.
// See http://crbug.com/148840, http://openradar.me/12316273
- base::mac::ScopedCFTypeRef<CFStringRef> ext_cf(
+ base::ScopedCFTypeRef<CFStringRef> ext_cf(
base::SysUTF8ToCFStringRef(ext_list[j]));
[file_type_set addObject:base::mac::CFToNSCast(ext_cf.get())];
}
@@ -340,9 +339,9 @@ NSView* SelectFileDialogImpl::GetAccessoryView(const FileTypeInfo* file_types,
const std::vector<base::FilePath::StringType>& ext_list =
file_types->extensions[type];
DCHECK(!ext_list.empty());
- base::mac::ScopedCFTypeRef<CFStringRef> uti(
+ base::ScopedCFTypeRef<CFStringRef> uti(
CreateUTIFromExtension(ext_list[0]));
- base::mac::ScopedCFTypeRef<CFStringRef> description(
+ base::ScopedCFTypeRef<CFStringRef> description(
UTTypeCopyDescription(uti.get()));
type_description =
« no previous file with comments | « ui/gfx/render_text_mac.cc ('k') | ui/snapshot/snapshot_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698