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

Unified Diff: chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc

Issue 23581006: Reland 220012: Move the functions of filebrowserPrivateApi from the file_manager namespace to the e… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 4 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/chromeos/extensions/file_manager/private_api_dialog.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
index 9ea1bf28648bd729130842320cbc674096d5fd63..78905a9f921cd2cb84addc185f1a34a716303317 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
@@ -11,7 +11,7 @@
using content::BrowserThread;
-namespace file_manager {
+namespace extensions {
CancelFileDialogFunction::CancelFileDialogFunction() {
}
@@ -20,7 +20,7 @@ CancelFileDialogFunction::~CancelFileDialogFunction() {
}
bool CancelFileDialogFunction::RunImpl() {
- int32 tab_id = util::GetTabId(dispatcher());
+ int32 tab_id = file_manager::util::GetTabId(dispatcher());
SelectFileDialogExtension::OnFileSelectionCanceled(tab_id);
SendResponse(true);
return true;
@@ -45,14 +45,15 @@ bool SelectFileFunction::RunImpl() {
bool need_local_path = false;
args_->GetBoolean(3, &need_local_path);
- util::GetSelectedFileInfoLocalPathOption option =
- util::NO_LOCAL_PATH_RESOLUTION;
+ file_manager::util::GetSelectedFileInfoLocalPathOption option =
+ file_manager::util::NO_LOCAL_PATH_RESOLUTION;
if (need_local_path) {
option = for_opening ?
- util::NEED_LOCAL_PATH_FOR_OPENING : util::NEED_LOCAL_PATH_FOR_SAVING;
+ file_manager::util::NEED_LOCAL_PATH_FOR_OPENING :
+ file_manager::util::NEED_LOCAL_PATH_FOR_SAVING;
}
- util::GetSelectedFileInfo(
+ file_manager::util::GetSelectedFileInfo(
render_view_host(),
profile(),
file_paths,
@@ -70,7 +71,7 @@ void SelectFileFunction::GetSelectedFileInfoResponse(
}
int index;
args_->GetInteger(1, &index);
- int32 tab_id = util::GetTabId(dispatcher());
+ int32 tab_id = file_manager::util::GetTabId(dispatcher());
SelectFileDialogExtension::OnFileSelected(tab_id, files[0], index);
SendResponse(true);
}
@@ -102,12 +103,13 @@ bool SelectFilesFunction::RunImpl() {
bool need_local_path = false;
args_->GetBoolean(1, &need_local_path);
- util::GetSelectedFileInfo(
+ file_manager::util::GetSelectedFileInfo(
render_view_host(),
profile(),
file_urls,
need_local_path ?
- util::NEED_LOCAL_PATH_FOR_OPENING : util::NO_LOCAL_PATH_RESOLUTION,
+ file_manager::util::NEED_LOCAL_PATH_FOR_OPENING :
+ file_manager::util::NO_LOCAL_PATH_RESOLUTION,
base::Bind(&SelectFilesFunction::GetSelectedFileInfoResponse, this));
return true;
}
@@ -115,9 +117,9 @@ bool SelectFilesFunction::RunImpl() {
void SelectFilesFunction::GetSelectedFileInfoResponse(
const std::vector<ui::SelectedFileInfo>& files) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- int32 tab_id = util::GetTabId(dispatcher());
+ int32 tab_id = file_manager::util::GetTabId(dispatcher());
SelectFileDialogExtension::OnMultiFilesSelected(tab_id, files);
SendResponse(true);
}
-} // namespace file_manager
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698