| Index: chrome/browser/media_galleries/media_galleries_dialog_controller.cc
|
| diff --git a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc
|
| index 98ba8daaec6415f1f95b40fba73e5a79c3cce9f1..bcd3ae3fd30f867412aafa23f08bb05118124eca 100644
|
| --- a/chrome/browser/media_galleries/media_galleries_dialog_controller.cc
|
| +++ b/chrome/browser/media_galleries/media_galleries_dialog_controller.cc
|
| @@ -147,7 +147,7 @@ string16 MediaGalleriesDialogController::GetHeader() const {
|
| }
|
|
|
| string16 MediaGalleriesDialogController::GetSubtext() const {
|
| - std::string extension_name(extension_ ? extension_->name() : "");
|
| + std::string extension_name(extension_ ? extension_->name() : std::string());
|
| return l10n_util::GetStringFUTF16(IDS_MEDIA_GALLERIES_DIALOG_SUBTEXT,
|
| UTF8ToUTF16(extension_name));
|
| }
|
| @@ -184,7 +184,9 @@ void MediaGalleriesDialogController::OnAddFolderClicked() {
|
| ui::SelectFileDialog::SELECT_FOLDER,
|
| l10n_util::GetStringUTF16(IDS_MEDIA_GALLERIES_DIALOG_ADD_GALLERY_TITLE),
|
| user_data_dir,
|
| - NULL, 0, FILE_PATH_LITERAL(""),
|
| + NULL,
|
| + 0,
|
| + base::FilePath::StringType(),
|
| web_contents_->GetView()->GetTopLevelNativeWindow(),
|
| NULL);
|
| }
|
|
|