| Index: components/filesystem/file_system_app.h
|
| diff --git a/components/filesystem/file_system_app.h b/components/filesystem/file_system_app.h
|
| index 62b2c706ecc37e8cd3a9cffdc2ad2b3b1ea56c86..fa3e2d926a4c5f5704f5d8d3ebafa3e6e99bdafb 100644
|
| --- a/components/filesystem/file_system_app.h
|
| +++ b/components/filesystem/file_system_app.h
|
| @@ -20,8 +20,8 @@ class Connector;
|
|
|
| namespace filesystem {
|
|
|
| -class FileSystemApp : public mojo::ShellClient,
|
| - public mojo::InterfaceFactory<FileSystem> {
|
| +class FileSystemApp : public shell::ShellClient,
|
| + public shell::InterfaceFactory<FileSystem> {
|
| public:
|
| FileSystemApp();
|
| ~FileSystemApp() override;
|
| @@ -30,12 +30,13 @@ class FileSystemApp : public mojo::ShellClient,
|
| // Gets the system specific toplevel profile directory.
|
| static base::FilePath GetUserDataDir();
|
|
|
| - // |mojo::ShellClient| override:
|
| - void Initialize(mojo::Connector* connector, const mojo::Identity& identity,
|
| + // |shell::ShellClient| override:
|
| + void Initialize(shell::Connector* connector,
|
| + const shell::Identity& identity,
|
| uint32_t id) override;
|
| - bool AcceptConnection(mojo::Connection* connection) override;
|
| + bool AcceptConnection(shell::Connection* connection) override;
|
| // |InterfaceFactory<Files>| implementation:
|
| - void Create(mojo::Connection* connection,
|
| + void Create(shell::Connection* connection,
|
| mojo::InterfaceRequest<FileSystem> request) override;
|
|
|
| mojo::TracingImpl tracing_;
|
|
|