| Index: chrome/browser/ui/views/user_data_dir_dialog_view.cc
|
| diff --git a/chrome/browser/ui/views/user_data_dir_dialog_view.cc b/chrome/browser/ui/views/user_data_dir_dialog_view.cc
|
| index a0e7128c1631df721d22318985a71558a42aa851..b5fa5d6c4450ac7c200ba350ff8013e3733c1ceb 100644
|
| --- a/chrome/browser/ui/views/user_data_dir_dialog_view.cc
|
| +++ b/chrome/browser/ui/views/user_data_dir_dialog_view.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "chrome/browser/ui/chrome_select_file_policy.h"
|
| #include "chrome/browser/ui/user_data_dir_dialog.h"
|
| #include "grit/chromium_strings.h"
|
| #include "grit/generated_resources.h"
|
| @@ -15,7 +16,8 @@
|
|
|
| UserDataDirDialogView::UserDataDirDialogView(const FilePath& user_data_dir)
|
| : ALLOW_THIS_IN_INITIALIZER_LIST(
|
| - select_file_dialog_(SelectFileDialog::Create(this))),
|
| + select_file_dialog_(SelectFileDialog::Create(
|
| + this, new ChromeSelectFilePolicy(NULL)))),
|
| is_blocking_(true) {
|
| const int kDialogWidth = 400;
|
| views::MessageBoxView::InitParams params(
|
| @@ -60,7 +62,7 @@ bool UserDataDirDialogView::Accept() {
|
| GetAncestor(message_box_view_->GetWidget()->GetNativeView(), GA_ROOT);
|
| select_file_dialog_->SelectFile(SelectFileDialog::SELECT_FOLDER,
|
| dialog_title, FilePath(), NULL, 0,
|
| - std::wstring(), NULL, owning_hwnd, NULL);
|
| + FilePath::StringType(), owning_hwnd, NULL);
|
| return false;
|
| }
|
|
|
|
|