diff options
Diffstat (limited to 'chrome/browser/views/user_data_dir_dialog.h')
| -rw-r--r-- | chrome/browser/views/user_data_dir_dialog.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/views/user_data_dir_dialog.h b/chrome/browser/views/user_data_dir_dialog.h index 5e658c23..a4421d9 100644 --- a/chrome/browser/views/user_data_dir_dialog.h +++ b/chrome/browser/views/user_data_dir_dialog.h @@ -13,6 +13,7 @@ #include "chrome/browser/shell_dialogs.h" #include "views/window/dialog_delegate.h" +class FilePath; class MessageBoxView; namespace views { class Window; @@ -26,10 +27,10 @@ class UserDataDirDialog : public views::DialogDelegate, // while the dialog is showing. If the user picks a directory, this method // returns the chosen directory. |user_data_dir| is the value of the // directory we were not able to use. - static std::wstring RunUserDataDirDialog(const std::wstring& user_data_dir); + static FilePath RunUserDataDirDialog(const FilePath& user_data_dir); virtual ~UserDataDirDialog(); - std::wstring user_data_dir() { return user_data_dir_; } + FilePath user_data_dir() const { return user_data_dir_; } // views::DialogDelegate Methods: virtual std::wstring GetDialogButtonLabel( @@ -52,10 +53,10 @@ class UserDataDirDialog : public views::DialogDelegate, virtual void FileSelectionCanceled(void* params); private: - explicit UserDataDirDialog(const std::wstring& user_data_dir); + explicit UserDataDirDialog(const FilePath& user_data_dir); // Empty until the user picks a directory. - std::wstring user_data_dir_; + FilePath user_data_dir_; MessageBoxView* message_box_view_; scoped_refptr<SelectFileDialog> select_file_dialog_; @@ -64,7 +65,7 @@ class UserDataDirDialog : public views::DialogDelegate, // waiting for the user to dismiss the dialog). bool is_blocking_; - DISALLOW_EVIL_CONSTRUCTORS(UserDataDirDialog); + DISALLOW_COPY_AND_ASSIGN(UserDataDirDialog); }; #endif // CHROME_BROWSER_USER_DATA_DIR_DIALOG_H__ |