| OLD | NEW |
|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #include "remoting/client/plugin/chromoting_instance.h" | 5 #include "remoting/client/plugin/chromoting_instance.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 object->Init(); | 271 object->Init(); |
| 272 | 272 |
| 273 // The pp::Var takes ownership of object here. | 273 // The pp::Var takes ownership of object here. |
| 274 instance_object_ = pp::Var(this, object); | 274 instance_object_ = pp::Var(this, object); |
| 275 } | 275 } |
| 276 | 276 |
| 277 return instance_object_; | 277 return instance_object_; |
| 278 } | 278 } |
| 279 | 279 |
| 280 ChromotingStats* ChromotingInstance::GetStats() { | 280 ChromotingStats* ChromotingInstance::GetStats() { |
| 281 if (!client_.get()) |
| 282 return NULL; |
| 281 return client_->GetStats(); | 283 return client_->GetStats(); |
| 282 } | 284 } |
| 283 | 285 |
| 284 } // namespace remoting | 286 } // namespace remoting |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6903048:
Merge 82973 - Cope gracefully with scripts querying stats before client has started. (Closed)
Base URL: svn://svn.chromium.org/chrome/branches/742/src/