| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ | 5 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ |
| 6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ | 6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H
_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> |
| 11 |
| 10 #include "base/android/jni_weak_ref.h" | 12 #include "base/android/jni_weak_ref.h" |
| 11 #include "base/android/scoped_java_ref.h" | 13 #include "base/android/scoped_java_ref.h" |
| 12 #include "base/compiler_specific.h" | 14 #include "base/compiler_specific.h" |
| 13 #include "base/memory/scoped_ptr.h" | |
| 14 #include "content/public/browser/web_contents_delegate.h" | 15 #include "content/public/browser/web_contents_delegate.h" |
| 15 | 16 |
| 16 class GURL; | 17 class GURL; |
| 17 | 18 |
| 18 namespace content { | 19 namespace content { |
| 19 class WebContents; | 20 class WebContents; |
| 20 class WebContentsDelegate; | 21 class WebContentsDelegate; |
| 21 struct NativeWebKeyboardEvent; | 22 struct NativeWebKeyboardEvent; |
| 22 struct OpenURLParams; | 23 struct OpenURLParams; |
| 23 } | 24 } |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 | 118 |
| 118 protected: | 119 protected: |
| 119 base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const; | 120 base::android::ScopedJavaLocalRef<jobject> GetJavaDelegate(JNIEnv* env) const; |
| 120 | 121 |
| 121 private: | 122 private: |
| 122 // We depend on the java side user of WebContentDelegateAndroid to hold a | 123 // We depend on the java side user of WebContentDelegateAndroid to hold a |
| 123 // strong reference to that object as long as they want to receive callbacks | 124 // strong reference to that object as long as they want to receive callbacks |
| 124 // on it. Using a weak ref here allows it to be correctly GCed. | 125 // on it. Using a weak ref here allows it to be correctly GCed. |
| 125 JavaObjectWeakGlobalRef weak_java_delegate_; | 126 JavaObjectWeakGlobalRef weak_java_delegate_; |
| 126 | 127 |
| 127 scoped_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; | 128 std::unique_ptr<ValidationMessageBubbleAndroid> validation_message_bubble_; |
| 128 }; | 129 }; |
| 129 | 130 |
| 130 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); | 131 bool RegisterWebContentsDelegateAndroid(JNIEnv* env); |
| 131 | 132 |
| 132 } // namespace web_contents_delegate_android | 133 } // namespace web_contents_delegate_android |
| 133 | 134 |
| 134 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ | 135 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROI
D_H_ |
| OLD | NEW |