Index: shell/service_cache_loader.h |
diff --git a/shell/android/android_handler_loader.h b/shell/service_cache_loader.h |
similarity index 58% |
copy from shell/android/android_handler_loader.h |
copy to shell/service_cache_loader.h |
index 4e782a5ce768b79dfc9db9cb29496c9f2e1bbca0..99af035ee56a375d22204457170d106447efa3a5 100644 |
--- a/shell/android/android_handler_loader.h |
+++ b/shell/service_cache_loader.h |
@@ -2,22 +2,21 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ |
-#define SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ |
+#ifndef SHELL_SERVICE_CACHE_LOADER_H_ |
+#define SHELL_SERVICE_CACHE_LOADER_H_ |
-#include "base/containers/scoped_ptr_hash_map.h" |
#include "base/macros.h" |
#include "base/memory/scoped_ptr.h" |
#include "mojo/public/cpp/application/application_impl.h" |
-#include "shell/android/android_handler.h" |
+#include "services/service_cache/service_cache_app.h" |
#include "shell/application_manager/application_loader.h" |
namespace shell { |
-class AndroidHandlerLoader : public ApplicationLoader { |
+class ServiceCacheLoader : public ApplicationLoader { |
public: |
- AndroidHandlerLoader(); |
- virtual ~AndroidHandlerLoader(); |
+ ServiceCacheLoader(); |
+ ~ServiceCacheLoader() override; |
private: |
// ApplicationLoader overrides: |
@@ -25,12 +24,12 @@ class AndroidHandlerLoader : public ApplicationLoader { |
const GURL& url, |
mojo::InterfaceRequest<mojo::Application> application_request) override; |
- AndroidHandler android_handler_; |
+ mojo::service_cache::ServiceCacheApp service_cache_; |
scoped_ptr<mojo::ApplicationImpl> application_; |
- DISALLOW_COPY_AND_ASSIGN(AndroidHandlerLoader); |
+ DISALLOW_COPY_AND_ASSIGN(ServiceCacheLoader); |
}; |
} // namespace shell |
-#endif // SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ |
+#endif // SHELL_SERVICE_CACHE_LOADER_H_ |