| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ | 5 #ifndef SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ |
| 6 #define SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ | 6 #define SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ |
| 7 | 7 |
| 8 #include "base/containers/scoped_ptr_hash_map.h" | 8 #include "base/containers/scoped_ptr_hash_map.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "mojo/public/cpp/application/application_impl.h" | 11 #include "mojo/public/cpp/application/application_impl.h" |
| 12 #include "shell/android/android_handler.h" | 12 #include "shell/android/android_handler.h" |
| 13 #include "shell/application_manager/application_loader.h" | 13 #include "shell/application_manager/application_loader.h" |
| 14 | 14 |
| 15 namespace mojo { | |
| 16 namespace shell { | 15 namespace shell { |
| 17 | 16 |
| 18 class AndroidHandlerLoader : public ApplicationLoader { | 17 class AndroidHandlerLoader : public ApplicationLoader { |
| 19 public: | 18 public: |
| 20 AndroidHandlerLoader(); | 19 AndroidHandlerLoader(); |
| 21 virtual ~AndroidHandlerLoader(); | 20 virtual ~AndroidHandlerLoader(); |
| 22 | 21 |
| 23 private: | 22 private: |
| 24 // ApplicationLoader overrides: | 23 // ApplicationLoader overrides: |
| 25 void Load(const GURL& url, | 24 void Load( |
| 26 InterfaceRequest<Application> application_request) override; | 25 const GURL& url, |
| 26 mojo::InterfaceRequest<mojo::Application> application_request) override; |
| 27 | 27 |
| 28 AndroidHandler android_handler_; | 28 AndroidHandler android_handler_; |
| 29 scoped_ptr<ApplicationImpl> application_; | 29 scoped_ptr<mojo::ApplicationImpl> application_; |
| 30 | 30 |
| 31 DISALLOW_COPY_AND_ASSIGN(AndroidHandlerLoader); | 31 DISALLOW_COPY_AND_ASSIGN(AndroidHandlerLoader); |
| 32 }; | 32 }; |
| 33 | 33 |
| 34 } // namespace shell | 34 } // namespace shell |
| 35 } // namespace mojo | |
| 36 | 35 |
| 37 #endif // SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ | 36 #endif // SHELL_ANDROID_ANDROID_HANDLER_LOADER_H_ |
| OLD | NEW |