ui/shell_dialogs: Use base::string16 now that string16 was moved into base namespace.

ui/shell_dialogs/select_file_dialog.h

Index: ui/shell_dialogs/select_file_dialog.h
diff --git a/ui/shell_dialogs/select_file_dialog.h b/ui/shell_dialogs/select_file_dialog.h
index 9a23485a14eb3c508418218a9c4d65aa7120ba4e..9ea0bc40be501a1ef240f9f6694de2e8082c30f3 100644
--- a/ui/shell_dialogs/select_file_dialog.h
+++ b/ui/shell_dialogs/select_file_dialog.h
@@ -27,7 +27,7 @@ class ShellDialogsDelegate;
 // Shows a dialog box for selecting a file or a folder.
 class SHELL_DIALOGS_EXPORT SelectFileDialog
     : public base::RefCountedThreadSafe<SelectFileDialog>,
-      public ui::BaseShellDialog {
+      public BaseShellDialog {
  public:
   enum Type {
     SELECT_NONE,
@@ -54,7 +54,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
     //
     // If not overridden, calls FileSelected() with path from |file|.
     virtual void FileSelectedWithExtraInfo(
-        const ui::SelectedFileInfo& file,
+        const SelectedFileInfo& file,
         int index,
         void* params);
 
@@ -68,7 +68,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
     //
     // If not overridden, calls MultiFilesSelected() with paths from |files|.
     virtual void MultiFilesSelectedWithExtraInfo(
-        const std::vector<ui::SelectedFileInfo>& files,
+        const std::vector<SelectedFileInfo>& files,
         void* params);
 
     // Notifies the Listener that the file/folder selection was aborted (via
@@ -86,13 +86,13 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
   // This is optional and should only be used by components that have to live
   // elsewhere in the tree due to layering violations. (For example, because of
   // a dependency on chrome's extension system.)
-  static void SetFactory(ui::SelectFileDialogFactory* factory);
+  static void SetFactory(SelectFileDialogFactory* factory);
 
   // Creates a dialog box helper. This is an inexpensive wrapper around the
   // platform-native file selection dialog. |policy| is an optional class that
   // can prevent showing a dialog.
   static scoped_refptr<SelectFileDialog> Create(Listener* listener,
-                                                ui::SelectFilePolicy* policy);
+                                                SelectFilePolicy* policy);
 
   // Holds information about allowed extensions on a file save dialog.
   struct SHELL_DIALOGS_EXPORT FileTypeInfo {
@@ -110,7 +110,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
     // Overrides the system descriptions of the specified extensions. Entries
     // correspond to |extensions|; if left blank the system descriptions will
     // be used.
-    std::vector<string16> extension_description_overrides;
+    std::vector<base::string16> extension_description_overrides;
 
     // Specifies whether there will be a filter added for all files (i.e. *.*).
     bool include_all_files;
@@ -147,7 +147,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
   // NOTE: only one instance of any shell dialog can be shown per owning_window
   //       at a time (for obvious reasons).
   void SelectFile(Type type,
-                  const string16& title,
+                  const base::string16& title,
                   const base::FilePath& default_path,
                   const FileTypeInfo* file_types,
                   int file_type_index,
@@ -161,8 +161,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
 
  protected:
   friend class base::RefCountedThreadSafe<SelectFileDialog>;
-  explicit SelectFileDialog(Listener* listener,
-                            ui::SelectFilePolicy* policy);
+  explicit SelectFileDialog(Listener* listener, SelectFilePolicy* policy);
   virtual ~SelectFileDialog();
 
   // Displays the actual file-selection dialog.
@@ -171,7 +170,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
   // AllowFileSelectionDialogs-Policy.
   virtual void SelectFileImpl(
       Type type,
-      const string16& title,
+      const base::string16& title,
       const base::FilePath& default_path,
       const FileTypeInfo* file_types,
       int file_type_index,
@@ -198,7 +197,7 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
   // Returns true if the dialog has multiple file type choices.
   virtual bool HasMultipleFileTypeChoicesImpl() = 0;
 
-  scoped_ptr<ui::SelectFilePolicy> select_file_policy_;
+  scoped_ptr<SelectFilePolicy> select_file_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(SelectFileDialog);
 };
@@ -206,4 +205,3 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
 }  // namespace ui
 
 #endif  // UI_SHELL_DIALOGS_SELECT_FILE_DIALOG_H_
-