summaryrefslogtreecommitdiffstats
path: root/components/filesystem
diff options
context:
space:
mode:
authorrockot <rockot@chromium.org>2016-03-14 16:38:28 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-14 23:40:38 +0000
commitd5669c5cce5e182f29a4387807cda0c74e8265eb (patch)
tree40ca09f1547e7ec5e5afbb193854cdd27d52b1b3 /components/filesystem
parent1afe4c3c566b3270b346c86f7698086e85b93730 (diff)
downloadchromium_src-d5669c5cce5e182f29a4387807cda0c74e8265eb.zip
chromium_src-d5669c5cce5e182f29a4387807cda0c74e8265eb.tar.gz
chromium_src-d5669c5cce5e182f29a4387807cda0c74e8265eb.tar.bz2
Change primordial pipes to ShellClient
Changes shell client startup pipes to be ShellClient instead of ShellClientFactory. This simplifies a lot of startup code. Due to this change, apps must now take responsibility for shutting themselves down when they feel it's appropriate. For now, all relevant apps are force-exited to mimic the old behavior. Once apptests are deleted, we should expose a clean quit closure to apps so they have something to run when they want to quit. Hard-exiting the process is definitely not the right thing to do. BUG= Review URL: https://codereview.chromium.org/1801963002 Cr-Commit-Position: refs/heads/master@{#381114}
Diffstat (limited to 'components/filesystem')
-rw-r--r--components/filesystem/file_system_app.cc4
-rw-r--r--components/filesystem/file_system_app.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc
index 9fe694c..9ec3806 100644
--- a/components/filesystem/file_system_app.cc
+++ b/components/filesystem/file_system_app.cc
@@ -55,6 +55,10 @@ void FileSystemApp::Create(mojo::Connection* connection,
lock_table_.get());
}
+void FileSystemApp::ShellConnectionLost() {
+ _exit(1);
+}
+
//static
base::FilePath FileSystemApp::GetUserDataDir() {
base::FilePath path;
diff --git a/components/filesystem/file_system_app.h b/components/filesystem/file_system_app.h
index 91c18bc..1eb65c3 100644
--- a/components/filesystem/file_system_app.h
+++ b/components/filesystem/file_system_app.h
@@ -34,6 +34,7 @@ class FileSystemApp : public mojo::ShellClient,
void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
uint32_t id) override;
bool AcceptConnection(mojo::Connection* connection) override;
+ void ShellConnectionLost() override;
// |InterfaceFactory<Files>| implementation:
void Create(mojo::Connection* connection,