| OLD | NEW |
|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/browser/renderer_host/java/jni_helper.h" | 5 #include "content/browser/android/java/jni_helper.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
| 11 #include "base/threading/platform_thread.h" | 11 #include "base/threading/platform_thread.h" |
| 12 | 12 |
| 13 namespace content { | 13 namespace content { |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| (...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 // Another thread may have populated the map already. | 90 // Another thread may have populated the map already. |
| 91 std::pair<MethodIDMap::const_iterator, bool> result = | 91 std::pair<MethodIDMap::const_iterator, bool> result = |
| 92 map->insert(std::make_pair(key, id)); | 92 map->insert(std::make_pair(key, id)); |
| 93 DCHECK_EQ(id, result.first->second); | 93 DCHECK_EQ(id, result.first->second); |
| 94 base::subtle::Release_Store(&g_method_id_map_lock, kUnlocked); | 94 base::subtle::Release_Store(&g_method_id_map_lock, kUnlocked); |
| 95 | 95 |
| 96 return id; | 96 return id; |
| 97 } | 97 } |
| 98 | 98 |
| 99 } // namespace content | 99 } // namespace content |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 336313018:
[Android] Move content/browser/{renderer_host => android}/java/* (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src