| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 COMPONENTS_MUS_ANDROID_LOADER_H_ | 5 #ifndef COMPONENTS_MUS_ANDROID_LOADER_H_ | 
| 6 #define COMPONENTS_MUS_ANDROID_LOADER_H_ | 6 #define COMPONENTS_MUS_ANDROID_LOADER_H_ | 
| 7 | 7 | 
| 8 #include "base/macros.h" | 8 #include "base/macros.h" | 
| 9 #include "mojo/shell/application_loader.h" | 9 #include "mojo/shell/application_loader.h" | 
| 10 | 10 | 
| 11 namespace mojo { | 11 namespace mojo { | 
| 12 class ApplicationImpl; | 12 class ShellConnection; | 
| 13 } | 13 } | 
| 14 | 14 | 
| 15 namespace mus { | 15 namespace mus { | 
| 16 | 16 | 
| 17 class AndroidLoader : public mojo::shell::ApplicationLoader { | 17 class AndroidLoader : public mojo::shell::ApplicationLoader { | 
| 18  public: | 18  public: | 
| 19   AndroidLoader(); | 19   AndroidLoader(); | 
| 20   ~AndroidLoader(); | 20   ~AndroidLoader(); | 
| 21 | 21 | 
| 22  private: | 22  private: | 
| 23   // Overridden from mojo::shell::ApplicationLoader: | 23   // Overridden from mojo::shell::ApplicationLoader: | 
| 24   void Load( | 24   void Load( | 
| 25       const GURL& url, | 25       const GURL& url, | 
| 26       mojo::InterfaceRequest<mojo::shell::mojom::Application> request) override; | 26       mojo::InterfaceRequest<mojo::shell::mojom::ShellClient> request) override; | 
| 27 | 27 | 
| 28   scoped_ptr<mojo::ApplicationImpl> app_; | 28   scoped_ptr<mojo::ShellConnection> app_; | 
| 29 | 29 | 
| 30   DISALLOW_COPY_AND_ASSIGN(AndroidLoader); | 30   DISALLOW_COPY_AND_ASSIGN(AndroidLoader); | 
| 31 }; | 31 }; | 
| 32 | 32 | 
| 33 }  // namespace mus | 33 }  // namespace mus | 
| 34 | 34 | 
| 35 #endif  // COMPONENTS_MUS_ANDROID_LOADER_H_ | 35 #endif  // COMPONENTS_MUS_ANDROID_LOADER_H_ | 
| OLD | NEW | 
|---|