| Index: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| index e102016542c0694d3755aa4e3f82c48b56f2a053..fbcf8a8e8a8b27e74017739dae1fc12b3eea87a7 100644
|
| --- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| +++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
|
| @@ -18,7 +18,7 @@
|
| #include "content/public/common/page_zoom.h"
|
| #include "url/gurl.h"
|
|
|
| -namespace file_manager {
|
| +namespace extensions {
|
|
|
| LogoutUserFunction::LogoutUserFunction() {
|
| }
|
| @@ -111,7 +111,7 @@ bool ZipSelectionFunction::RunImpl() {
|
| if (!args_->GetString(0, &dir_url) || dir_url.empty())
|
| return false;
|
|
|
| - base::FilePath src_dir = util::GetLocalPathFromURL(
|
| + base::FilePath src_dir = file_manager::util::GetLocalPathFromURL(
|
| render_view_host(), profile(), GURL(dir_url));
|
| if (src_dir.empty())
|
| return false;
|
| @@ -126,7 +126,7 @@ bool ZipSelectionFunction::RunImpl() {
|
| for (size_t i = 0; i < selection_urls->GetSize(); ++i) {
|
| std::string file_url;
|
| selection_urls->GetString(i, &file_url);
|
| - base::FilePath path = util::GetLocalPathFromURL(
|
| + base::FilePath path = file_manager::util::GetLocalPathFromURL(
|
| render_view_host(), profile(), GURL(file_url));
|
| if (path.empty())
|
| return false;
|
| @@ -155,10 +155,10 @@ bool ZipSelectionFunction::RunImpl() {
|
| src_relative_paths.push_back(relative_path);
|
| }
|
|
|
| - zip_file_creator_ = new ZipFileCreator(this,
|
| - src_dir,
|
| - src_relative_paths,
|
| - dest_file);
|
| + zip_file_creator_ = new file_manager::ZipFileCreator(this,
|
| + src_dir,
|
| + src_relative_paths,
|
| + dest_file);
|
|
|
| // Keep the refcount until the zipping is complete on utility process.
|
| AddRef();
|
| @@ -198,4 +198,4 @@ bool ZoomFunction::RunImpl() {
|
| return true;
|
| }
|
|
|
| -} // namespace file_manager
|
| +} // namespace extensions
|
|
|