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 #include "android_webview/native/aw_web_contents_delegate.h" | 5 #include "android_webview/native/aw_web_contents_delegate.h" |
6 | 6 |
7 #include "android_webview/browser/aw_javascript_dialog_manager.h" | 7 #include "android_webview/browser/aw_javascript_dialog_manager.h" |
8 #include "android_webview/browser/find_helper.h" | 8 #include "android_webview/browser/find_helper.h" |
9 #include "android_webview/native/aw_contents.h" | 9 #include "android_webview/native/aw_contents.h" |
10 #include "android_webview/native/aw_contents_io_thread_client_impl.h" | 10 #include "android_webview/native/aw_contents_io_thread_client_impl.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #include "content/public/browser/web_contents.h" | 27 #include "content/public/browser/web_contents.h" |
28 #include "content/public/common/file_chooser_file_info.h" | 28 #include "content/public/common/file_chooser_file_info.h" |
29 #include "content/public/common/file_chooser_params.h" | 29 #include "content/public/common/file_chooser_params.h" |
30 #include "content/public/common/media_stream_request.h" | 30 #include "content/public/common/media_stream_request.h" |
31 #include "jni/AwWebContentsDelegate_jni.h" | 31 #include "jni/AwWebContentsDelegate_jni.h" |
32 #include "net/base/escape.h" | 32 #include "net/base/escape.h" |
33 | 33 |
34 using base::android::AttachCurrentThread; | 34 using base::android::AttachCurrentThread; |
35 using base::android::ConvertUTF16ToJavaString; | 35 using base::android::ConvertUTF16ToJavaString; |
36 using base::android::ConvertUTF8ToJavaString; | 36 using base::android::ConvertUTF8ToJavaString; |
| 37 using base::android::JavaParamRef; |
37 using base::android::ScopedJavaLocalRef; | 38 using base::android::ScopedJavaLocalRef; |
38 using content::FileChooserParams; | 39 using content::FileChooserParams; |
39 using content::WebContents; | 40 using content::WebContents; |
40 | 41 |
41 namespace android_webview { | 42 namespace android_webview { |
42 | 43 |
43 namespace { | 44 namespace { |
44 | 45 |
45 // WARNING: these constants are exposed in the public interface Java side, so | 46 // WARNING: these constants are exposed in the public interface Java side, so |
46 // must remain in sync with what clients are expecting. | 47 // must remain in sync with what clients are expecting. |
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
313 DVLOG(0) << "File Chooser result: mode = " << mode | 314 DVLOG(0) << "File Chooser result: mode = " << mode |
314 << ", file paths = " << base::JoinString(file_path_str, ":"); | 315 << ", file paths = " << base::JoinString(file_path_str, ":"); |
315 rfh->FilesSelectedInChooser(files, mode); | 316 rfh->FilesSelectedInChooser(files, mode); |
316 } | 317 } |
317 | 318 |
318 bool RegisterAwWebContentsDelegate(JNIEnv* env) { | 319 bool RegisterAwWebContentsDelegate(JNIEnv* env) { |
319 return RegisterNativesImpl(env); | 320 return RegisterNativesImpl(env); |
320 } | 321 } |
321 | 322 |
322 } // namespace android_webview | 323 } // namespace android_webview |
OLD | NEW |