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

Unified Diff: chrome/browser/extensions/extension_file_browser_private_api.cc

Issue 7628011: Revert Revert 94812 - Formatting feature initial commit for ChromeOS Tree (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 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/extensions/extension_file_browser_private_api.cc
===================================================================
--- chrome/browser/extensions/extension_file_browser_private_api.cc (revision 96422)
+++ chrome/browser/extensions/extension_file_browser_private_api.cc (working copy)
@@ -639,7 +639,6 @@
}
virtual void DidFail(base::PlatformFileError error_code) OVERRIDE {
- LOG(WARNING) << "Local file system cant be resolved";
BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
NewRunnableMethod(function_,
@@ -1212,12 +1211,11 @@
std::string mount_path;
if (!args_->GetString(0, &mount_path)) {
- return false;
+ return false;
}
UrlList file_paths;
file_paths.push_back(GURL(mount_path));
-
BrowserThread::PostTask(
BrowserThread::FILE, FROM_HERE,
NewRunnableMethod(this,
@@ -1235,7 +1233,6 @@
SendResponse(false);
return;
}
-
#ifdef OS_CHROMEOS
chromeos::CrosLibrary::Get()->GetMountLibrary()->UnmountPath(
files[0].value().c_str());
@@ -1257,7 +1254,7 @@
base::ListValue *mounts = new base::ListValue();
result_.reset(mounts);
- #ifdef OS_CHROMEOS
+#ifdef OS_CHROMEOS
chromeos::MountLibrary *mount_lib =
chromeos::CrosLibrary::Get()->GetMountLibrary();
chromeos::MountLibrary::MountPointMap mount_points =
@@ -1270,10 +1267,37 @@
mounts->Append(MountPointToValue(profile_, it->second));
}
#endif
+
SendResponse(true);
return true;
}
+FormatDeviceFunction::FormatDeviceFunction() {
+}
+
+FormatDeviceFunction::~FormatDeviceFunction() {
+}
+
+bool FormatDeviceFunction::RunImpl() {
+ if (args_->GetSize() != 1) {
+ return false;
+ }
+
+ std::string volume_mount_path;
+ if (!args_->GetString(0, &volume_mount_path)) {
+ NOTREACHED();
+ return false;
+ }
+
+#ifdef OS_CHROMEOS
+ chromeos::CrosLibrary::Get()->GetMountLibrary()->FormatMountedDevice(
+ volume_mount_path.c_str());
+#endif
+
+ SendResponse(true);
+ return true;
+}
+
GetVolumeMetadataFunction::GetVolumeMetadataFunction() {
}
@@ -1427,6 +1451,8 @@
SET_STRING(IDS_FILE_BROWSER, CONFIRM_DELETE_ONE);
SET_STRING(IDS_FILE_BROWSER, CONFIRM_DELETE_SOME);
+ SET_STRING(IDS_FILE_BROWSER, FORMATTING_WARNING);
+
SET_STRING(IDS_FILE_BROWSER, SELECT_FOLDER_TITLE);
SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_FILE_TITLE);
SET_STRING(IDS_FILE_BROWSER, SELECT_OPEN_MULTI_FILE_TITLE);

Powered by Google App Engine
This is Rietveld 408576698