| 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 #ifndef CONTENT_BROWSER_MOJO_SERVICE_REGISTRY_ANDROID_H_ | 5 #ifndef CONTENT_COMMON_MOJO_SERVICE_REGISTRY_ANDROID_H_ |
| 6 #define CONTENT_BROWSER_MOJO_SERVICE_REGISTRY_ANDROID_H_ | 6 #define CONTENT_COMMON_MOJO_SERVICE_REGISTRY_ANDROID_H_ |
| 7 | 7 |
| 8 #include <jni.h> | 8 #include <jni.h> |
| 9 | 9 |
| 10 #include "base/android/scoped_java_ref.h" | 10 #include "base/android/scoped_java_ref.h" |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
| 13 | 13 |
| 14 namespace content { | 14 namespace content { |
| 15 | 15 |
| 16 class ServiceRegistryImpl; | 16 class ServiceRegistryImpl; |
| (...skipping 29 matching lines...) Expand all Loading... |
| 46 | 46 |
| 47 private: | 47 private: |
| 48 ServiceRegistryImpl* service_registry_; | 48 ServiceRegistryImpl* service_registry_; |
| 49 base::android::ScopedJavaGlobalRef<jobject> obj_; | 49 base::android::ScopedJavaGlobalRef<jobject> obj_; |
| 50 | 50 |
| 51 DISALLOW_COPY_AND_ASSIGN(ServiceRegistryAndroid); | 51 DISALLOW_COPY_AND_ASSIGN(ServiceRegistryAndroid); |
| 52 }; | 52 }; |
| 53 | 53 |
| 54 } // namespace content | 54 } // namespace content |
| 55 | 55 |
| 56 #endif // CONTENT_BROWSER_MOJO_SERVICE_REGISTRY_ANDROID_H_ | 56 #endif // CONTENT_COMMON_MOJO_SERVICE_REGISTRY_ANDROID_H_ |
| OLD | NEW |