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

Unified Diff: chrome/browser/extensions/api/developer_private/entry_picker.cc

Issue 979453002: [Extensions] Make chrome://extensions use developerPrivate for unpacked loading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comments Created 5 years, 10 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/extensions/api/developer_private/entry_picker.cc
diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.cc b/chrome/browser/extensions/api/developer_private/entry_picker.cc
index 9baaa1ec14f7e48cf97e87a83ac9de5f6e700a93..65d5638f54186be0f95b6b98b83c23fa13a4bfc4 100644
--- a/chrome/browser/extensions/api/developer_private/entry_picker.cc
+++ b/chrome/browser/extensions/api/developer_private/entry_picker.cc
@@ -32,29 +32,29 @@ EntryPicker::EntryPicker(EntryPickerClient* client,
const ui::SelectFileDialog::FileTypeInfo& info,
int file_type_index)
: client_(client) {
- select_file_dialog_ = ui::SelectFileDialog::Create(
- this, new ChromeSelectFilePolicy(web_contents));
-
- gfx::NativeWindow owning_window = web_contents ?
- platform_util::GetTopLevel(web_contents->GetNativeView()) :
- NULL;
-
if (g_skip_picker_for_test) {
if (g_path_to_be_picked_for_test) {
content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
base::Bind(
&EntryPicker::FileSelected,
base::Unretained(this), *g_path_to_be_picked_for_test, 1,
- static_cast<void*>(NULL)));
+ static_cast<void*>(nullptr)));
} else {
content::BrowserThread::PostTask(content::BrowserThread::UI, FROM_HERE,
base::Bind(
&EntryPicker::FileSelectionCanceled,
- base::Unretained(this), static_cast<void*>(NULL)));
+ base::Unretained(this), static_cast<void*>(nullptr)));
}
return;
}
+ select_file_dialog_ = ui::SelectFileDialog::Create(
+ this, new ChromeSelectFilePolicy(web_contents));
+
+ gfx::NativeWindow owning_window = web_contents ?
+ platform_util::GetTopLevel(web_contents->GetNativeView()) :
+ nullptr;
+
select_file_dialog_->SelectFile(picker_type,
select_title,
last_directory,
@@ -62,7 +62,7 @@ EntryPicker::EntryPicker(EntryPickerClient* client,
file_type_index,
base::FilePath::StringType(),
owning_window,
- NULL);
+ nullptr);
}
EntryPicker::~EntryPicker() {}

Powered by Google App Engine
This is Rietveld 408576698