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 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
178 if (java_delegate.obj()) { | 178 if (java_delegate.obj()) { |
179 Java_AwWebContentsDelegate_navigationStateChanged(env, java_delegate, | 179 Java_AwWebContentsDelegate_navigationStateChanged(env, java_delegate, |
180 changed_flags); | 180 changed_flags); |
181 } | 181 } |
182 } | 182 } |
183 | 183 |
184 // Notifies the delegate about the creation of a new WebContents. This | 184 // Notifies the delegate about the creation of a new WebContents. This |
185 // typically happens when popups are created. | 185 // typically happens when popups are created. |
186 void AwWebContentsDelegate::WebContentsCreated( | 186 void AwWebContentsDelegate::WebContentsCreated( |
187 WebContents* source_contents, | 187 WebContents* source_contents, |
| 188 int opener_render_process_id, |
188 int opener_render_frame_id, | 189 int opener_render_frame_id, |
189 const std::string& frame_name, | 190 const std::string& frame_name, |
190 const GURL& target_url, | 191 const GURL& target_url, |
191 content::WebContents* new_contents) { | 192 content::WebContents* new_contents) { |
192 AwContentsIoThreadClientImpl::RegisterPendingContents(new_contents); | 193 AwContentsIoThreadClientImpl::RegisterPendingContents(new_contents); |
193 } | 194 } |
194 | 195 |
195 void AwWebContentsDelegate::CloseContents(WebContents* source) { | 196 void AwWebContentsDelegate::CloseContents(WebContents* source) { |
196 JNIEnv* env = AttachCurrentThread(); | 197 JNIEnv* env = AttachCurrentThread(); |
197 | 198 |
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
312 DVLOG(0) << "File Chooser result: mode = " << mode | 313 DVLOG(0) << "File Chooser result: mode = " << mode |
313 << ", file paths = " << base::JoinString(file_path_str, ":"); | 314 << ", file paths = " << base::JoinString(file_path_str, ":"); |
314 rfh->FilesSelectedInChooser(files, mode); | 315 rfh->FilesSelectedInChooser(files, mode); |
315 } | 316 } |
316 | 317 |
317 bool RegisterAwWebContentsDelegate(JNIEnv* env) { | 318 bool RegisterAwWebContentsDelegate(JNIEnv* env) { |
318 return RegisterNativesImpl(env); | 319 return RegisterNativesImpl(env); |
319 } | 320 } |
320 | 321 |
321 } // namespace android_webview | 322 } // namespace android_webview |
OLD | NEW |