| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 SERVICES_NAVIGATION_NAVIGATION_H_ | 5 #ifndef SERVICES_NAVIGATION_NAVIGATION_H_ |
| 6 #define SERVICES_NAVIGATION_NAVIGATION_H_ | 6 #define SERVICES_NAVIGATION_NAVIGATION_H_ |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/sequenced_task_runner.h" | 10 #include "base/sequenced_task_runner.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 | 21 |
| 22 namespace navigation { | 22 namespace navigation { |
| 23 | 23 |
| 24 class Navigation : public content::ConnectionFilter, public mojom::ViewFactory { | 24 class Navigation : public content::ConnectionFilter, public mojom::ViewFactory { |
| 25 public: | 25 public: |
| 26 Navigation(); | 26 Navigation(); |
| 27 ~Navigation() override; | 27 ~Navigation() override; |
| 28 | 28 |
| 29 private: | 29 private: |
| 30 // content::ConnectionFilter: | 30 // content::ConnectionFilter: |
| 31 bool OnConnect(const shell::Identity& remote_identity, | 31 bool OnConnect(const service_manager::Identity& remote_identity, |
| 32 shell::InterfaceRegistry* registry, | 32 service_manager::InterfaceRegistry* registry, |
| 33 shell::Connector* connector) override; | 33 service_manager::Connector* connector) override; |
| 34 | 34 |
| 35 // mojom::ViewFactory: | 35 // mojom::ViewFactory: |
| 36 void CreateView(mojom::ViewClientPtr client, | 36 void CreateView(mojom::ViewClientPtr client, |
| 37 mojom::ViewRequest request) override; | 37 mojom::ViewRequest request) override; |
| 38 | 38 |
| 39 void CreateViewFactory(mojom::ViewFactoryRequest request); | 39 void CreateViewFactory(mojom::ViewFactoryRequest request); |
| 40 void ViewFactoryLost(); | 40 void ViewFactoryLost(); |
| 41 | 41 |
| 42 scoped_refptr<base::SequencedTaskRunner> view_task_runner_; | 42 scoped_refptr<base::SequencedTaskRunner> view_task_runner_; |
| 43 | 43 |
| 44 shell::Connector* connector_ = nullptr; | 44 service_manager::Connector* connector_ = nullptr; |
| 45 std::string client_user_id_; | 45 std::string client_user_id_; |
| 46 | 46 |
| 47 shell::ServiceContextRefFactory ref_factory_; | 47 service_manager::ServiceContextRefFactory ref_factory_; |
| 48 std::set<std::unique_ptr<shell::ServiceContextRef>> refs_; | 48 std::set<std::unique_ptr<service_manager::ServiceContextRef>> refs_; |
| 49 | 49 |
| 50 mojo::BindingSet<mojom::ViewFactory> bindings_; | 50 mojo::BindingSet<mojom::ViewFactory> bindings_; |
| 51 | 51 |
| 52 base::WeakPtrFactory<Navigation> weak_factory_; | 52 base::WeakPtrFactory<Navigation> weak_factory_; |
| 53 | 53 |
| 54 DISALLOW_COPY_AND_ASSIGN(Navigation); | 54 DISALLOW_COPY_AND_ASSIGN(Navigation); |
| 55 }; | 55 }; |
| 56 | 56 |
| 57 } // navigation | 57 } // navigation |
| 58 | 58 |
| 59 #endif // SERVICES_NAVIGATION_NAVIGATION_H_ | 59 #endif // SERVICES_NAVIGATION_NAVIGATION_H_ |
| OLD | NEW |