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

Unified Diff: chrome/browser/bookmarks/bookmark_extension_api.cc

Issue 10820034: Remove redirection header and add "ui::" before all SelectFileDialog usage. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reuploading for different try run. Created 8 years, 5 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/bookmarks/bookmark_extension_api.cc
diff --git a/chrome/browser/bookmarks/bookmark_extension_api.cc b/chrome/browser/bookmarks/bookmark_extension_api.cc
index d26c98650d0a53df9d7fbc168847df5fe5f0dda1..9476c995d4c98a914d596b6f6030fb0c0b61129f 100644
--- a/chrome/browser/bookmarks/bookmark_extension_api.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_api.cc
@@ -848,7 +848,7 @@ BookmarksIOFunction::~BookmarksIOFunction() {
select_file_dialog_->ListenerDestroyed();
}
-void BookmarksIOFunction::SelectFile(SelectFileDialog::Type type) {
+void BookmarksIOFunction::SelectFile(ui::SelectFileDialog::Type type) {
// GetDefaultFilepathForBookmarkExport() might have to touch the filesystem
// (stat or access, for example), so this requires a thread with IO allowed.
if (!BrowserThread::CurrentlyOn(BrowserThread::FILE)) {
@@ -860,10 +860,10 @@ void BookmarksIOFunction::SelectFile(SelectFileDialog::Type type) {
// Pre-populating the filename field in case this is a SELECT_SAVEAS_FILE
// dialog. If not, there is no filename field in the dialog box.
FilePath default_path;
- if (type == SelectFileDialog::SELECT_SAVEAS_FILE)
+ if (type == ui::SelectFileDialog::SELECT_SAVEAS_FILE)
default_path = GetDefaultFilepathForBookmarkExport();
else
- DCHECK(type == SelectFileDialog::SELECT_OPEN_FILE);
+ DCHECK(type == ui::SelectFileDialog::SELECT_OPEN_FILE);
// After getting the |default_path|, ask the UI to display the file dialog.
BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
@@ -871,7 +871,7 @@ void BookmarksIOFunction::SelectFile(SelectFileDialog::Type type) {
type, default_path));
}
-void BookmarksIOFunction::ShowSelectFileDialog(SelectFileDialog::Type type,
+void BookmarksIOFunction::ShowSelectFileDialog(ui::SelectFileDialog::Type type,
const FilePath& default_path) {
// Balanced in one of the three callbacks of SelectFileDialog:
// either FileSelectionCanceled, MultiFilesSelected, or FileSelected
@@ -880,9 +880,9 @@ void BookmarksIOFunction::ShowSelectFileDialog(SelectFileDialog::Type type,
WebContents* web_contents = dispatcher()->delegate()->
GetAssociatedWebContents();
- select_file_dialog_ = SelectFileDialog::Create(
+ select_file_dialog_ = ui::SelectFileDialog::Create(
this, new ChromeSelectFilePolicy(web_contents));
- SelectFileDialog::FileTypeInfo file_type_info;
+ ui::SelectFileDialog::FileTypeInfo file_type_info;
file_type_info.extensions.resize(1);
file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html"));
@@ -912,7 +912,7 @@ void BookmarksIOFunction::MultiFilesSelected(
bool ImportBookmarksFunction::RunImpl() {
if (!EditBookmarksEnabled())
return false;
- SelectFile(SelectFileDialog::SELECT_OPEN_FILE);
+ SelectFile(ui::SelectFileDialog::SELECT_OPEN_FILE);
return true;
}
@@ -937,7 +937,7 @@ void ImportBookmarksFunction::FileSelected(const FilePath& path,
}
bool ExportBookmarksFunction::RunImpl() {
- SelectFile(SelectFileDialog::SELECT_SAVEAS_FILE);
+ SelectFile(ui::SelectFileDialog::SELECT_SAVEAS_FILE);
return true;
}
« no previous file with comments | « chrome/browser/bookmarks/bookmark_extension_api.h ('k') | chrome/browser/chromeos/extensions/file_browser_handler_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698