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 MOJO_SHELL_APPLICATION_INSTANCE_H_ | 5 #ifndef MOJO_SHELL_APPLICATION_INSTANCE_H_ |
6 #define MOJO_SHELL_APPLICATION_INSTANCE_H_ | 6 #define MOJO_SHELL_APPLICATION_INSTANCE_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <set> | 10 #include <set> |
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 | 50 |
51 mojom::ShellClient* shell_client() { return shell_client_.get(); } | 51 mojom::ShellClient* shell_client() { return shell_client_.get(); } |
52 const Identity& identity() const { return identity_; } | 52 const Identity& identity() const { return identity_; } |
53 uint32_t id() const { return id_; } | 53 uint32_t id() const { return id_; } |
54 base::ProcessId pid() const { return pid_; } | 54 base::ProcessId pid() const { return pid_; } |
55 void set_pid(base::ProcessId pid) { pid_ = pid; } | 55 void set_pid(base::ProcessId pid) { pid_ = pid; } |
56 | 56 |
57 private: | 57 private: |
58 // Shell implementation: | 58 // Shell implementation: |
59 void Connect(const String& app_url, | 59 void Connect(const String& app_url, |
| 60 uint32_t user_id, |
60 shell::mojom::InterfaceProviderRequest remote_interfaces, | 61 shell::mojom::InterfaceProviderRequest remote_interfaces, |
61 shell::mojom::InterfaceProviderPtr local_interfaces, | 62 shell::mojom::InterfaceProviderPtr local_interfaces, |
62 mojom::CapabilityFilterPtr filter, | 63 mojom::CapabilityFilterPtr filter, |
63 const ConnectCallback& callback) override; | 64 const ConnectCallback& callback) override; |
64 void QuitApplication() override; | 65 void QuitApplication() override; |
65 | 66 |
66 // PIDReceiver implementation: | 67 // PIDReceiver implementation: |
67 void SetPID(uint32_t pid) override; | 68 void SetPID(uint32_t pid) override; |
68 | 69 |
69 uint32_t GenerateUniqueID() const; | 70 uint32_t GenerateUniqueID() const; |
(...skipping 21 matching lines...) Expand all Loading... |
91 NativeRunner* native_runner_; | 92 NativeRunner* native_runner_; |
92 base::ProcessId pid_; | 93 base::ProcessId pid_; |
93 | 94 |
94 DISALLOW_COPY_AND_ASSIGN(ApplicationInstance); | 95 DISALLOW_COPY_AND_ASSIGN(ApplicationInstance); |
95 }; | 96 }; |
96 | 97 |
97 } // namespace shell | 98 } // namespace shell |
98 } // namespace mojo | 99 } // namespace mojo |
99 | 100 |
100 #endif // MOJO_SHELL_APPLICATION_INSTANCE_H_ | 101 #endif // MOJO_SHELL_APPLICATION_INSTANCE_H_ |
OLD | NEW |