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 BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 5 #ifndef BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
6 #define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 6 #define BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 class BlimpMessageThreadPipe; | 26 class BlimpMessageThreadPipe; |
27 class BrowserConnectionHandler; | 27 class BrowserConnectionHandler; |
28 class ClientConnectionManager; | 28 class ClientConnectionManager; |
29 class ThreadPipeManager; | 29 class ThreadPipeManager; |
30 | 30 |
31 namespace client { | 31 namespace client { |
32 | 32 |
33 class ClientNetworkComponents; | 33 class ClientNetworkComponents; |
34 class NavigationFeature; | 34 class NavigationFeature; |
35 class RenderWidgetFeature; | 35 class RenderWidgetFeature; |
| 36 class SettingsFeature; |
36 class TabControlFeature; | 37 class TabControlFeature; |
37 | 38 |
38 class NetworkEventObserver { | 39 class NetworkEventObserver { |
39 public: | 40 public: |
40 NetworkEventObserver() {} | 41 NetworkEventObserver() {} |
41 virtual ~NetworkEventObserver() {} | 42 virtual ~NetworkEventObserver() {} |
42 | 43 |
43 virtual void OnConnected() = 0; | 44 virtual void OnConnected() = 0; |
44 virtual void OnDisconnected(int result) = 0; | 45 virtual void OnDisconnected(int result) = 0; |
45 }; | 46 }; |
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
83 void RegisterFeatures(); | 84 void RegisterFeatures(); |
84 | 85 |
85 // NetworkEventObserver implementation. | 86 // NetworkEventObserver implementation. |
86 void OnConnected() override; | 87 void OnConnected() override; |
87 void OnDisconnected(int result) override; | 88 void OnDisconnected(int result) override; |
88 | 89 |
89 base::Thread io_thread_; | 90 base::Thread io_thread_; |
90 scoped_ptr<TabControlFeature> tab_control_feature_; | 91 scoped_ptr<TabControlFeature> tab_control_feature_; |
91 scoped_ptr<NavigationFeature> navigation_feature_; | 92 scoped_ptr<NavigationFeature> navigation_feature_; |
92 scoped_ptr<RenderWidgetFeature> render_widget_feature_; | 93 scoped_ptr<RenderWidgetFeature> render_widget_feature_; |
| 94 scoped_ptr<SettingsFeature> settings_feature_; |
93 | 95 |
94 // The AssignmentSource is used when the user of BlimpClientSession calls | 96 // The AssignmentSource is used when the user of BlimpClientSession calls |
95 // Connect() to get a valid assignment and later connect to the engine. | 97 // Connect() to get a valid assignment and later connect to the engine. |
96 scoped_ptr<AssignmentSource> assignment_source_; | 98 scoped_ptr<AssignmentSource> assignment_source_; |
97 | 99 |
98 // Container struct for network components. | 100 // Container struct for network components. |
99 // Must be deleted on the IO thread. | 101 // Must be deleted on the IO thread. |
100 scoped_ptr<ClientNetworkComponents> net_components_; | 102 scoped_ptr<ClientNetworkComponents> net_components_; |
101 | 103 |
102 scoped_ptr<ThreadPipeManager> thread_pipe_manager_; | 104 scoped_ptr<ThreadPipeManager> thread_pipe_manager_; |
103 | 105 |
104 base::WeakPtrFactory<BlimpClientSession> weak_factory_; | 106 base::WeakPtrFactory<BlimpClientSession> weak_factory_; |
105 | 107 |
106 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); | 108 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); |
107 }; | 109 }; |
108 | 110 |
109 } // namespace client | 111 } // namespace client |
110 } // namespace blimp | 112 } // namespace blimp |
111 | 113 |
112 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 114 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
OLD | NEW |