Chromium Code Reviews| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 75 virtual void ConnectWithAssignment(AssignmentSource::Result result, | 75 virtual void ConnectWithAssignment(AssignmentSource::Result result, |
| 76 const Assignment& assignment); | 76 const Assignment& assignment); |
| 77 | 77 |
| 78 protected: | 78 protected: |
| 79 ~BlimpClientSession() override; | 79 ~BlimpClientSession() override; |
| 80 | 80 |
| 81 // Notified every time the AssignmentSource returns the result of an attempted | 81 // Notified every time the AssignmentSource returns the result of an attempted |
| 82 // assignment request. | 82 // assignment request. |
| 83 virtual void OnAssignmentConnectionAttempted(AssignmentSource::Result result); | 83 virtual void OnAssignmentConnectionAttempted(AssignmentSource::Result result); |
| 84 | 84 |
| 85 std::string engineIPAddress_; | |
|
Kevin M
2016/03/31 19:41:49
Make the fields private and add a public or protec
shaktisahu
2016/04/06 06:50:25
Acknowledged.
Moved these out of BlimpClientSessio
| |
| 86 std::string engineVersion_; | |
| 87 | |
| 85 private: | 88 private: |
| 86 void RegisterFeatures(); | 89 void RegisterFeatures(); |
| 87 | 90 |
| 88 // NetworkEventObserver implementation. | 91 // NetworkEventObserver implementation. |
| 89 void OnConnected() override; | 92 void OnConnected() override; |
| 90 void OnDisconnected(int result) override; | 93 void OnDisconnected(int result) override; |
| 91 | 94 |
| 92 base::Thread io_thread_; | 95 base::Thread io_thread_; |
| 93 scoped_ptr<TabControlFeature> tab_control_feature_; | 96 scoped_ptr<TabControlFeature> tab_control_feature_; |
| 94 scoped_ptr<NavigationFeature> navigation_feature_; | 97 scoped_ptr<NavigationFeature> navigation_feature_; |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 108 | 111 |
| 109 base::WeakPtrFactory<BlimpClientSession> weak_factory_; | 112 base::WeakPtrFactory<BlimpClientSession> weak_factory_; |
| 110 | 113 |
| 111 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); | 114 DISALLOW_COPY_AND_ASSIGN(BlimpClientSession); |
| 112 }; | 115 }; |
| 113 | 116 |
| 114 } // namespace client | 117 } // namespace client |
| 115 } // namespace blimp | 118 } // namespace blimp |
| 116 | 119 |
| 117 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ | 120 #endif // BLIMP_CLIENT_SESSION_BLIMP_CLIENT_SESSION_H_ |
| OLD | NEW |