Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 284 object->Init(); | 284 object->Init(); |
| 285 | 285 |
| 286 // The pp::Var takes ownership of object here. | 286 // The pp::Var takes ownership of object here. |
| 287 instance_object_ = pp::Var(this, object); | 287 instance_object_ = pp::Var(this, object); |
| 288 } | 288 } |
| 289 | 289 |
| 290 return instance_object_; | 290 return instance_object_; |
| 291 } | 291 } |
| 292 | 292 |
| 293 ChromotingStats* ChromotingInstance::GetStats() { | 293 ChromotingStats* ChromotingInstance::GetStats() { |
| 294 if (client_.get() == NULL) | |
|
Alpha Left Google
2011/04/25 23:14:24
nit: if (!client_.get()) to be consistent.
| |
| 295 return NULL; | |
| 294 return client_->GetStats(); | 296 return client_->GetStats(); |
| 295 } | 297 } |
| 296 | 298 |
| 297 } // namespace remoting | 299 } // namespace remoting |
| OLD | NEW |