| Index: services/user/user_shell_client.h
|
| diff --git a/components/profile_service/profile_app.h b/services/user/user_shell_client.h
|
| similarity index 53%
|
| rename from components/profile_service/profile_app.h
|
| rename to services/user/user_shell_client.h
|
| index 0fff6c42e481d8ddc934a61eb262b307449aae14..de52157e01cac978383cd2ebd5b88f53cd9c2b3b 100644
|
| --- a/components/profile_service/profile_app.h
|
| +++ b/services/user/user_shell_client.h
|
| @@ -2,39 +2,32 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef COMPONENTS_PROFILE_SERVICE_PROFILE_APP_H_
|
| -#define COMPONENTS_PROFILE_SERVICE_PROFILE_APP_H_
|
| +#ifndef SERVICES_USER_USER_SHELL_CLIENT_H_
|
| +#define SERVICES_USER_USER_SHELL_CLIENT_H_
|
|
|
| #include "base/memory/ref_counted.h"
|
| #include "components/filesystem/lock_table.h"
|
| #include "components/leveldb/public/interfaces/leveldb.mojom.h"
|
| -#include "components/profile_service/public/interfaces/profile.mojom.h"
|
| #include "mojo/public/cpp/bindings/binding_set.h"
|
| #include "services/shell/public/cpp/interface_factory.h"
|
| #include "services/shell/public/cpp/shell_client.h"
|
| #include "services/tracing/public/cpp/tracing_impl.h"
|
| +#include "services/user/public/interfaces/user_service.mojom.h"
|
|
|
| -namespace profile {
|
| +namespace user_service {
|
|
|
| -scoped_ptr<mojo::ShellClient> CreateProfileApp(
|
| - scoped_refptr<base::SingleThreadTaskRunner> profile_service_runner,
|
| +scoped_ptr<mojo::ShellClient> CreateUserShellClient(
|
| + scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner);
|
|
|
| -// Application which hands off per-profile services.
|
| -//
|
| -// This Application serves ProfileService. In the future, this application will
|
| -// probably also offer any service that most Profile using applications will
|
| -// need, such as preferences; this class will have to be made into a
|
| -// application which is an InterfaceProvider which internally spawns threads
|
| -// for different sub-applications.
|
| -class ProfileApp : public mojo::ShellClient,
|
| - public mojo::InterfaceFactory<ProfileService>,
|
| - public mojo::InterfaceFactory<leveldb::LevelDBService> {
|
| +class UserShellClient : public mojo::ShellClient,
|
| + public mojo::InterfaceFactory<mojom::UserService>,
|
| + public mojo::InterfaceFactory<leveldb::LevelDBService> {
|
| public:
|
| - ProfileApp(
|
| - scoped_refptr<base::SingleThreadTaskRunner> profile_service_runner,
|
| + UserShellClient(
|
| + scoped_refptr<base::SingleThreadTaskRunner> user_service_runner,
|
| scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner);
|
| - ~ProfileApp() override;
|
| + ~UserShellClient() override;
|
|
|
| private:
|
| // |ShellClient| override:
|
| @@ -43,9 +36,9 @@ class ProfileApp : public mojo::ShellClient,
|
| uint32_t id) override;
|
| bool AcceptConnection(mojo::Connection* connection) override;
|
|
|
| - // |InterfaceFactory<ProfileService>| implementation:
|
| + // |InterfaceFactory<mojom::UserService>| implementation:
|
| void Create(mojo::Connection* connection,
|
| - ProfileServiceRequest request) override;
|
| + mojom::UserServiceRequest request) override;
|
|
|
| // |InterfaceFactory<LevelDBService>| implementation:
|
| void Create(mojo::Connection* connection,
|
| @@ -55,22 +48,22 @@ class ProfileApp : public mojo::ShellClient,
|
| leveldb::LevelDBServiceRequest request);
|
| void OnLevelDBServiceError();
|
|
|
| - scoped_refptr<base::SingleThreadTaskRunner> profile_service_runner_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> user_service_runner_;
|
| scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner_;
|
|
|
| mojo::TracingImpl tracing_;
|
|
|
| // We create these two objects so we can delete them on the correct task
|
| // runners.
|
| - class ProfileServiceObjects;
|
| - scoped_ptr<ProfileServiceObjects> profile_objects_;
|
| + class UserServiceObjects;
|
| + scoped_ptr<UserServiceObjects> user_objects_;
|
|
|
| class LevelDBServiceObjects;
|
| scoped_ptr<LevelDBServiceObjects> leveldb_objects_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ProfileApp);
|
| + DISALLOW_COPY_AND_ASSIGN(UserShellClient);
|
| };
|
|
|
| -} // namespace profile
|
| +} // namespace user_service
|
|
|
| -#endif // COMPONENTS_PROFILE_SERVICE_PROFILE_APP_H_
|
| +#endif // SERVICES_USER_USER_SHELL_CLIENT_H_
|
|
|