Replace FilePath with base::FilePath in some more top level directories.

ui/shell_dialogs/select_file_dialog_mac.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/shell_dialogs/select_file_dialog.h"
 
 #import <Cocoa/Cocoa.h>
 #include <CoreServices/CoreServices.h>
 
 #include <map>
@@ skipping 10 matching lines @@
 #include "base/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "grit/ui_strings.h"
 #import "ui/base/cocoa/nib_loading.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 
 namespace {
 
 const int kFileTypePopupTag = 1234;
 
-CFStringRef CreateUTIFromExtension(const FilePath::StringType& ext) {
+CFStringRef CreateUTIFromExtension(const base::FilePath::StringType& ext) {
   base::mac::ScopedCFTypeRef<CFStringRef> ext_cf(
       base::SysUTF8ToCFStringRef(ext));
   return UTTypeCreatePreferredIdentifierForTag(
       kUTTagClassFilenameExtension, ext_cf.get(), NULL);
 }
 
 }  // namespace
 
 class SelectFileDialogImpl;
 
@@ skipping 24 matching lines @@
 
   // BaseShellDialog implementation.
   virtual bool IsRunning(gfx::NativeWindow parent_window) const;
   virtual void ListenerDestroyed();
 
   // Callback from ObjC bridge.
   void FileWasSelected(NSSavePanel* dialog,
                        NSWindow* parent_window,
                        bool was_cancelled,
                        bool is_multi,
-                       const std::vector<FilePath>& files,
+                       const std::vector<base::FilePath>& files,
                        int index);
 
   bool ShouldEnableFilename(NSSavePanel* dialog, NSString* filename);
 
  protected:
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
-  virtual void SelectFileImpl(Type type,
-                              const string16& title,
-                              const FilePath& default_path,
-                              const FileTypeInfo* file_types,
-                              int file_type_index,
-                              const FilePath::StringType& default_extension,
-                              gfx::NativeWindow owning_window,
-                              void* params) OVERRIDE;
+  virtual void SelectFileImpl(
+      Type type,
+      const string16& title,
+      const base::FilePath& default_path,
+      const FileTypeInfo* file_types,
+      int file_type_index,
+      const base::FilePath::StringType& default_extension,
+      gfx::NativeWindow owning_window,
+      void* params) OVERRIDE;
 
  private:
   virtual ~SelectFileDialogImpl();
 
   // Gets the accessory view for the save dialog.
   NSView* GetAccessoryView(const FileTypeInfo* file_types,
                            int file_type_index);
 
   virtual bool HasMultipleFileTypeChoicesImpl();
 
@@ skipping 22 matching lines @@
 }
 
 bool SelectFileDialogImpl::IsRunning(gfx::NativeWindow parent_window) const {
   return parents_.find(parent_window) != parents_.end();
 }
 
 void SelectFileDialogImpl::ListenerDestroyed() {
   listener_ = NULL;
 }
 
-void SelectFileDialogImpl::FileWasSelected(NSSavePanel* dialog,
-                                           NSWindow* parent_window,
-                                           bool was_cancelled,
-                                           bool is_multi,
-                                           const std::vector<FilePath>& files,
-                                           int index) {
+void SelectFileDialogImpl::FileWasSelected(
+    NSSavePanel* dialog,
+    NSWindow* parent_window,
+    bool was_cancelled,
+    bool is_multi,
+    const std::vector<base::FilePath>& files,
+    int index) {
   void* params = params_map_[dialog];
   params_map_.erase(dialog);
   parents_.erase(parent_window);
   type_map_.erase(dialog);
 
   [dialog setDelegate:nil];
 
   if (!listener_)
     return;
 
@@ skipping 13 matching lines @@
   // If this is a single open file dialog, disable selecting packages.
   if (type_map_[dialog] != SELECT_OPEN_FILE)
     return true;
 
   return ![[NSWorkspace sharedWorkspace] isFilePackageAtPath:filename];
 }
 
 void SelectFileDialogImpl::SelectFileImpl(
     Type type,
     const string16& title,
-    const FilePath& default_path,
+    const base::FilePath& default_path,
     const FileTypeInfo* file_types,
     int file_type_index,
-    const FilePath::StringType& default_extension,
+    const base::FilePath::StringType& default_extension,
     gfx::NativeWindow owning_window,
     void* params) {
   DCHECK(type == SELECT_FOLDER ||
          type == SELECT_OPEN_FILE ||
          type == SELECT_OPEN_MULTI_FILE ||
          type == SELECT_SAVEAS_FILE);
   parents_.insert(owning_window);
 
   // Note: we need to retain the dialog as owning_window can be null.
   // (See http://crbug.com/29213 .)
@@ skipping 27 matching lines @@
       // While the example given in the header for FileTypeInfo lists an example
       // |file_types->extensions| value as
       //   { { "htm", "html" }, { "txt" } }
       // it is not always the case that the given extensions in one of the sub-
       // lists are all synonyms. In fact, in the case of a <select> element with
       // multiple "accept" types, all the extensions allowed for all the types
       // will be part of one list. To be safe, allow the types of all the
       // specified extensions.
       NSMutableSet* file_type_set = [NSMutableSet set];
       for (size_t i = 0; i < file_types->extensions.size(); ++i) {
-        const std::vector<FilePath::StringType>& ext_list =
+        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(
               CreateUTIFromExtension(ext_list[j]));
           [file_type_set addObject:base::mac::CFToNSCast(uti.get())];
 
           // Always allow the extension itself, in case the UTI doesn't map
           // 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
@@ skipping 93 matching lines @@
 
   size_t type_count = file_types->extensions.size();
   for (size_t type = 0; type < type_count; ++type) {
     NSString* type_description;
     if (type < file_types->extension_description_overrides.size()) {
       type_description = base::SysUTF16ToNSString(
           file_types->extension_description_overrides[type]);
     } else {
       // No description given for a list of extensions; pick the first one from
       // the list (arbitrarily) and use its description.
-      const std::vector<FilePath::StringType>& ext_list =
+      const std::vector<base::FilePath::StringType>& ext_list =
           file_types->extensions[type];
       DCHECK(!ext_list.empty());
       base::mac::ScopedCFTypeRef<CFStringRef> uti(
           CreateUTIFromExtension(ext_list[0]));
       base::mac::ScopedCFTypeRef<CFStringRef> description(
           UTTypeCopyDescription(uti.get()));
 
       type_description =
           [[base::mac::CFToNSCast(description.get()) retain] autorelease];
     }
@@ skipping 16 matching lines @@
     selectFileDialogImpl_ = s;
   }
   return self;
 }
 
 - (void)endedPanel:(NSSavePanel*)panel
          didCancel:(bool)did_cancel
               type:(ui::SelectFileDialog::Type)type
       parentWindow:(NSWindow*)parentWindow {
   int index = 0;
-  std::vector<FilePath> paths;
+  std::vector<base::FilePath> paths;
   if (!did_cancel) {
     if (type == ui::SelectFileDialog::SELECT_SAVEAS_FILE) {
-      if ([[panel URL] isFileURL])
-        paths.push_back(FilePath(base::SysNSStringToUTF8([[panel URL] path])));
+      if ([[panel URL] isFileURL]) {
+        paths.push_back(base::FilePath(
+            base::SysNSStringToUTF8([[panel URL] path])));
+      }
 
       NSView* accessoryView = [panel accessoryView];
       if (accessoryView) {
         NSPopUpButton* popup = [accessoryView viewWithTag:kFileTypePopupTag];
         if (popup) {
           // File type indexes are 1-based.
           index = [popup indexOfSelectedItem] + 1;
         }
       } else {
         index = 1;
       }
     } else {
       CHECK([panel isKindOfClass:[NSOpenPanel class]]);
       NSArray* urls = [static_cast<NSOpenPanel*>(panel) URLs];
       for (NSURL* url in urls)
         if ([url isFileURL])
-          paths.push_back(FilePath(base::SysNSStringToUTF8([url path])));
+          paths.push_back(base::FilePath(base::SysNSStringToUTF8([url path])));
     }
   }
 
   bool isMulti = type == ui::SelectFileDialog::SELECT_OPEN_MULTI_FILE;
   selectFileDialogImpl_->FileWasSelected(panel,
                                          parentWindow,
                                          did_cancel,
                                          isMulti,
                                          paths,
                                          index);
   [panel release];
 }
 
 - (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename {
   return selectFileDialogImpl_->ShouldEnableFilename(sender, filename);
 }
 
 @end
 
 namespace ui {
 
 SelectFileDialog* CreateMacSelectFileDialog(
     SelectFileDialog::Listener* listener,
     SelectFilePolicy* policy) {
   return new SelectFileDialogImpl(listener, policy);
 }
 
 }  // namespace ui