| OLD | NEW |
|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "mojo/common/environment_data.h" | 5 #include "mojo/common/environment_data.h" |
| 6 | 6 |
| 7 #include "base/stl_util.h" | 7 #include "base/stl_util.h" |
| 8 | 8 |
| 9 namespace mojo { | 9 namespace mojo { |
| 10 namespace common { | 10 namespace common { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 delete old; | 42 delete old; |
| 43 } | 43 } |
| 44 | 44 |
| 45 EnvironmentData::Data* EnvironmentData::GetData(const void* key) { | 45 EnvironmentData::Data* EnvironmentData::GetData(const void* key) { |
| 46 base::AutoLock auto_lock(data_lock_); | 46 base::AutoLock auto_lock(data_lock_); |
| 47 return data_map_.count(key) > 0 ? data_map_[key] : NULL; | 47 return data_map_.count(key) > 0 ? data_map_[key] : NULL; |
| 48 } | 48 } |
| 49 | 49 |
| 50 } // namespace common | 50 } // namespace common |
| 51 } // namespace mojo | 51 } // namespace mojo |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 299263002:
Revert 272472 "Mojo: nuke EnvironmentData" (Closed)
Base URL: svn://svn.chromium.org/chrome/