#include "base/bind.h"
#include "base/callback.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
#include "base/lazy_instance.h"
#include "base/md5.h"
#include "base/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/chrome_select_file_policy.h"
#include "chrome/common/pref_names.h"
+#include "chrome/grit/generated_resources.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_contents.h"
-#include "content/public/browser/web_contents_view.h"
#include "content/public/common/content_client.h"
#include "content/public/common/url_constants.h"
-#include "grit/generated_resources.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/isolated_context.h"
+#include "storage/common/fileapi/file_system_util.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/shell_dialogs/select_file_dialog.h"
-#include "webkit/browser/fileapi/isolated_context.h"
-#include "webkit/common/fileapi/file_system_util.h"
using base::Bind;
using base::Callback;
canceled_callback_(canceled_callback),
web_contents_(web_contents) {
select_file_dialog_ = ui::SelectFileDialog::Create(
- this, new ChromeSelectFilePolicy(NULL));
+ this, new ChromeSelectFilePolicy(web_contents));
}
void Show(ui::SelectFileDialog::Type type,
AddRef(); // Balanced in the three listener outcomes.
select_file_dialog_->SelectFile(
type,
- string16(),
+ base::string16(),
default_path,
NULL,
0,
base::FilePath::StringType(),
- platform_util::GetTopLevel(web_contents_->GetView()->GetNativeView()),
+ platform_util::GetTopLevel(web_contents_->GetNativeView()),
NULL);
}
SelectedCallback selected_callback_;
CanceledCallback canceled_callback_;
WebContents* web_contents_;
+
+ DISALLOW_COPY_AND_ASSIGN(SelectFileDialog);
};
void WriteToFile(const base::FilePath& path, const std::string& content) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
DCHECK(!path.empty());
- file_util::WriteFile(path, content.c_str(), content.length());
+ base::WriteFile(path, content.c_str(), content.length());
}
void AppendToFile(const base::FilePath& path, const std::string& content) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
DCHECK(!path.empty());
- file_util::AppendToFile(path, content.c_str(), content.length());
+ base::AppendToFile(path, content.c_str(), content.length());
}
-fileapi::IsolatedContext* isolated_context() {
+storage::IsolatedContext* isolated_context() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- fileapi::IsolatedContext* isolated_context =
- fileapi::IsolatedContext::GetInstance();
+ storage::IsolatedContext* isolated_context =
+ storage::IsolatedContext::GetInstance();
DCHECK(isolated_context);
return isolated_context;
}
const base::FilePath& path,
std::string* registered_name) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- CHECK(web_contents->GetURL().SchemeIs(chrome::kChromeDevToolsScheme));
+ CHECK(web_contents->GetURL().SchemeIs(content::kChromeDevToolsScheme));
std::string file_system_id = isolated_context()->RegisterFileSystemForPath(
- fileapi::kFileSystemTypeNativeLocal, path, registered_name);
+ storage::kFileSystemTypeNativeLocal,
+ std::string(),
+ path,
+ registered_name);
content::ChildProcessSecurityPolicy* policy =
content::ChildProcessSecurityPolicy::GetInstance();
const std::string& registered_name,
const std::string& file_system_path) {
const GURL origin = web_contents->GetURL().GetOrigin();
- std::string file_system_name = fileapi::GetIsolatedFileSystemName(
- origin,
- file_system_id);
- std::string root_url = fileapi::GetIsolatedFileSystemRootURIString(
- origin,
- file_system_id,
- registered_name);
+ std::string file_system_name =
+ storage::GetIsolatedFileSystemName(origin, file_system_id);
+ std::string root_url = storage::GetIsolatedFileSystemRootURIString(
+ origin, file_system_id, registered_name);
return DevToolsFileHelper::FileSystem(file_system_name,
root_url,
file_system_path);
}
set<std::string> GetAddedFileSystemPaths(Profile* profile) {
- const DictionaryValue* file_systems_paths_value =
+ const base::DictionaryValue* file_systems_paths_value =
profile->GetPrefs()->GetDictionary(prefs::kDevToolsFileSystemPaths);
set<std::string> result;
- for (DictionaryValue::Iterator it(*file_systems_paths_value); !it.IsAtEnd();
- it.Advance()) {
+ for (base::DictionaryValue::Iterator it(*file_systems_paths_value);
+ !it.IsAtEnd(); it.Advance()) {
result.insert(it.key());
}
return result;
void DevToolsFileHelper::Save(const std::string& url,
const std::string& content,
bool save_as,
- const SaveCallback& callback) {
+ const SaveCallback& saveCallback,
+ const SaveCallback& cancelCallback) {
PathsMap::iterator it = saved_files_.find(url);
if (it != saved_files_.end() && !save_as) {
- SaveAsFileSelected(url, content, callback, it->second);
+ SaveAsFileSelected(url, content, saveCallback, it->second);
return;
}
- const DictionaryValue* file_map =
+ const base::DictionaryValue* file_map =
profile_->GetPrefs()->GetDictionary(prefs::kDevToolsEditedFiles);
base::FilePath initial_path;
- const Value* path_value;
+ const base::Value* path_value;
if (file_map->Get(base::MD5String(url), &path_value))
base::GetValueAsFilePath(*path_value, &initial_path);
weak_factory_.GetWeakPtr(),
url,
content,
- callback),
+ saveCallback),
Bind(&DevToolsFileHelper::SaveAsFileSelectionCanceled,
- weak_factory_.GetWeakPtr()),
+ weak_factory_.GetWeakPtr(),
+ cancelCallback),
web_contents_);
select_file_dialog->Show(ui::SelectFileDialog::SELECT_SAVEAS_FILE,
initial_path);
DictionaryPrefUpdate update(profile_->GetPrefs(),
prefs::kDevToolsEditedFiles);
- DictionaryValue* files_map = update.Get();
+ base::DictionaryValue* files_map = update.Get();
files_map->SetWithoutPathExpansion(base::MD5String(url),
base::CreateFilePathValue(path));
callback.Run();
Bind(&WriteToFile, path, content));
}
-void DevToolsFileHelper::SaveAsFileSelectionCanceled() {
+void DevToolsFileHelper::SaveAsFileSelectionCanceled(
+ const SaveCallback& callback) {
+ callback.Run();
}
void DevToolsFileHelper::AddFileSystem(
base::FilePath());
}
+void DevToolsFileHelper::UpgradeDraggedFileSystemPermissions(
+ const std::string& file_system_url,
+ const AddFileSystemCallback& callback,
+ const ShowInfoBarCallback& show_info_bar_callback) {
+ storage::FileSystemURL root_url =
+ isolated_context()->CrackURL(GURL(file_system_url));
+ if (!root_url.is_valid() || !root_url.path().empty()) {
+ callback.Run(FileSystem());
+ return;
+ }
+
+ std::vector<storage::MountPoints::MountPointInfo> mount_points;
+ isolated_context()->GetDraggedFileInfo(root_url.filesystem_id(),
+ &mount_points);
+
+ std::vector<storage::MountPoints::MountPointInfo>::const_iterator it =
+ mount_points.begin();
+ for (; it != mount_points.end(); ++it)
+ InnerAddFileSystem(callback, show_info_bar_callback, it->path);
+}
+
void DevToolsFileHelper::InnerAddFileSystem(
const AddFileSystemCallback& callback,
const ShowInfoBarCallback& show_info_bar_callback,
const base::FilePath& path) {
std::string file_system_path = path.AsUTF8Unsafe();
- const DictionaryValue* file_systems_paths_value =
+ const base::DictionaryValue* file_systems_paths_value =
profile_->GetPrefs()->GetDictionary(prefs::kDevToolsFileSystemPaths);
if (file_systems_paths_value->HasKey(file_system_path)) {
callback.Run(FileSystem());
}
std::string path_display_name = path.AsEndingWithSeparator().AsUTF8Unsafe();
- string16 message = l10n_util::GetStringFUTF16(
+ base::string16 message = l10n_util::GetStringFUTF16(
IDS_DEV_TOOLS_CONFIRM_ADD_FILE_SYSTEM_MESSAGE,
- UTF8ToUTF16(path_display_name));
+ base::UTF8ToUTF16(path_display_name));
show_info_bar_callback.Run(
message,
Bind(&DevToolsFileHelper::AddUserConfirmedFileSystem,
DictionaryPrefUpdate update(profile_->GetPrefs(),
prefs::kDevToolsFileSystemPaths);
- DictionaryValue* file_systems_paths_value = update.Get();
- file_systems_paths_value->SetWithoutPathExpansion(file_system_path,
- Value::CreateNullValue());
+ base::DictionaryValue* file_systems_paths_value = update.Get();
+ file_systems_paths_value->SetWithoutPathExpansion(
+ file_system_path, base::Value::CreateNullValue());
FileSystem filesystem = CreateFileSystemStruct(web_contents_,
file_system_id,
DictionaryPrefUpdate update(profile_->GetPrefs(),
prefs::kDevToolsFileSystemPaths);
- DictionaryValue* file_systems_paths_value = update.Get();
+ base::DictionaryValue* file_systems_paths_value = update.Get();
file_systems_paths_value->RemoveWithoutPathExpansion(file_system_path, NULL);
}
projects / platform / framework / web / crosswalk.git / blobdiff