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

Unified Diff: components/filesystem/file_system_impl.cc

Issue 1720603002: Revert of mojo: Get mojo:leveldb and mojo:filesystem compiled into content. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « components/filesystem/file_system_impl.h ('k') | components/filesystem/filesystem.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/filesystem/file_system_impl.cc
diff --git a/components/filesystem/file_system_impl.cc b/components/filesystem/file_system_impl.cc
index cf444b38d2ffcc04456efd3bdb372194aaf57ddf..5a60c5cfd9278d6200cb88c32dacfaf7ab1a3ebe 100644
--- a/components/filesystem/file_system_impl.cc
+++ b/components/filesystem/file_system_impl.cc
@@ -16,6 +16,7 @@
#include "base/memory/scoped_ptr.h"
#include "build/build_config.h"
#include "components/filesystem/directory_impl.h"
+#include "components/filesystem/file_system_app.h"
#include "mojo/shell/public/cpp/connection.h"
#include "url/gurl.h"
@@ -44,10 +45,12 @@
} // namespace filesystem
-FileSystemImpl::FileSystemImpl(mojo::Connection* connection,
+FileSystemImpl::FileSystemImpl(FileSystemApp* app,
+ mojo::Connection* connection,
mojo::InterfaceRequest<FileSystem> request,
LockTable* lock_table)
- : remote_application_url_(connection->GetRemoteApplicationURL()),
+ : app_(app),
+ remote_application_url_(connection->GetRemoteApplicationURL()),
binding_(this, std::move(request)),
lock_table_(lock_table) {}
@@ -86,8 +89,9 @@
}
if (!path.empty()) {
- new DirectoryImpl(
+ DirectoryImpl* dir_impl = new DirectoryImpl(
std::move(directory), path, std::move(temp_dir), lock_table_);
+ app_->RegisterDirectoryToClient(dir_impl, std::move(client));
callback.Run(FileError::OK);
} else {
callback.Run(FileError::FAILED);
« no previous file with comments | « components/filesystem/file_system_impl.h ('k') | components/filesystem/filesystem.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698