Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1742)

Unified Diff: chrome/browser/ui/views/user_data_dir_dialog_view.cc

Issue 10698053: Breaks compile on Linux Aura (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/user_data_dir_dialog_view.cc
===================================================================
--- chrome/browser/ui/views/user_data_dir_dialog_view.cc (revision 144942)
+++ chrome/browser/ui/views/user_data_dir_dialog_view.cc (working copy)
@@ -7,7 +7,6 @@
#include "base/logging.h"
#include "base/run_loop.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"
@@ -17,8 +16,7 @@
UserDataDirDialogView::UserDataDirDialogView(const FilePath& user_data_dir)
: ALLOW_THIS_IN_INITIALIZER_LIST(
- select_file_dialog_(SelectFileDialog::Create(
- this, new ChromeSelectFilePolicy(NULL)))),
+ select_file_dialog_(SelectFileDialog::Create(this))),
is_blocking_(true) {
const int kDialogWidth = 400;
views::MessageBoxView::InitParams params(
@@ -63,7 +61,7 @@
GetAncestor(message_box_view_->GetWidget()->GetNativeView(), GA_ROOT);
select_file_dialog_->SelectFile(SelectFileDialog::SELECT_FOLDER,
dialog_title, FilePath(), NULL, 0,
- FilePath::StringType(), owning_hwnd, NULL);
+ std::wstring(), NULL, owning_hwnd, NULL);
return false;
}
« no previous file with comments | « chrome/browser/ui/views/select_file_dialog_win.cc ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698