| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_contents.h" | 5 #include "android_webview/native/aw_contents.h" |
| 6 | 6 |
| 7 #include <limits> | 7 #include <limits> |
| 8 | 8 |
| 9 #include "android_webview/browser/aw_browser_context.h" | 9 #include "android_webview/browser/aw_browser_context.h" |
| 10 #include "android_webview/browser/aw_browser_main_parts.h" | 10 #include "android_webview/browser/aw_browser_main_parts.h" |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 #include "content/public/browser/browser_thread.h" | 56 #include "content/public/browser/browser_thread.h" |
| 57 #include "content/public/browser/cert_store.h" | 57 #include "content/public/browser/cert_store.h" |
| 58 #include "content/public/browser/child_process_security_policy.h" | 58 #include "content/public/browser/child_process_security_policy.h" |
| 59 #include "content/public/browser/favicon_status.h" | 59 #include "content/public/browser/favicon_status.h" |
| 60 #include "content/public/browser/message_port_provider.h" | 60 #include "content/public/browser/message_port_provider.h" |
| 61 #include "content/public/browser/navigation_entry.h" | 61 #include "content/public/browser/navigation_entry.h" |
| 62 #include "content/public/browser/render_frame_host.h" | 62 #include "content/public/browser/render_frame_host.h" |
| 63 #include "content/public/browser/render_process_host.h" | 63 #include "content/public/browser/render_process_host.h" |
| 64 #include "content/public/browser/render_view_host.h" | 64 #include "content/public/browser/render_view_host.h" |
| 65 #include "content/public/browser/web_contents.h" | 65 #include "content/public/browser/web_contents.h" |
| 66 #include "content/public/common/content_switches.h" | |
| 67 #include "content/public/common/message_port_types.h" | 66 #include "content/public/common/message_port_types.h" |
| 68 #include "content/public/common/renderer_preferences.h" | 67 #include "content/public/common/renderer_preferences.h" |
| 69 #include "content/public/common/ssl_status.h" | 68 #include "content/public/common/ssl_status.h" |
| 70 #include "jni/AwContents_jni.h" | 69 #include "jni/AwContents_jni.h" |
| 71 #include "net/base/auth.h" | 70 #include "net/base/auth.h" |
| 72 #include "net/cert/x509_certificate.h" | 71 #include "net/cert/x509_certificate.h" |
| 73 #include "third_party/skia/include/core/SkPicture.h" | 72 #include "third_party/skia/include/core/SkPicture.h" |
| 74 #include "ui/gfx/android/java_bitmap.h" | 73 #include "ui/gfx/android/java_bitmap.h" |
| 75 #include "ui/gfx/geometry/rect_f.h" | 74 #include "ui/gfx/geometry/rect_f.h" |
| 76 #include "ui/gfx/geometry/size.h" | 75 #include "ui/gfx/geometry/size.h" |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 201 render_view_host_ext_.reset( | 200 render_view_host_ext_.reset( |
| 202 new AwRenderViewHostExt(this, web_contents_.get())); | 201 new AwRenderViewHostExt(this, web_contents_.get())); |
| 203 | 202 |
| 204 permission_request_handler_.reset( | 203 permission_request_handler_.reset( |
| 205 new PermissionRequestHandler(this, web_contents_.get())); | 204 new PermissionRequestHandler(this, web_contents_.get())); |
| 206 | 205 |
| 207 AwAutofillClient* autofill_manager_delegate = | 206 AwAutofillClient* autofill_manager_delegate = |
| 208 AwAutofillClient::FromWebContents(web_contents_.get()); | 207 AwAutofillClient::FromWebContents(web_contents_.get()); |
| 209 if (autofill_manager_delegate) | 208 if (autofill_manager_delegate) |
| 210 InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); | 209 InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); |
| 211 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 210 content::SynchronousCompositor::SetClientForWebContents( |
| 212 switches::kSingleProcess)) { | 211 web_contents_.get(), &browser_view_renderer_); |
| 213 // TODO(boliu): Figure out how to deal with this more nicely. | |
| 214 content::SynchronousCompositor::SetClientForWebContents( | |
| 215 web_contents_.get(), &browser_view_renderer_); | |
| 216 } | |
| 217 } | 212 } |
| 218 | 213 |
| 219 void AwContents::SetJavaPeers(JNIEnv* env, | 214 void AwContents::SetJavaPeers(JNIEnv* env, |
| 220 jobject obj, | 215 jobject obj, |
| 221 jobject aw_contents, | 216 jobject aw_contents, |
| 222 jobject web_contents_delegate, | 217 jobject web_contents_delegate, |
| 223 jobject contents_client_bridge, | 218 jobject contents_client_bridge, |
| 224 jobject io_thread_client, | 219 jobject io_thread_client, |
| 225 jobject intercept_navigation_delegate) { | 220 jobject intercept_navigation_delegate) { |
| 226 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 221 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| (...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1227 jobject obj) { | 1222 jobject obj) { |
| 1228 web_contents_->ResumeLoadingCreatedWebContents(); | 1223 web_contents_->ResumeLoadingCreatedWebContents(); |
| 1229 } | 1224 } |
| 1230 | 1225 |
| 1231 void SetShouldDownloadFavicons(JNIEnv* env, | 1226 void SetShouldDownloadFavicons(JNIEnv* env, |
| 1232 const JavaParamRef<jclass>& jclazz) { | 1227 const JavaParamRef<jclass>& jclazz) { |
| 1233 g_should_download_favicons = true; | 1228 g_should_download_favicons = true; |
| 1234 } | 1229 } |
| 1235 | 1230 |
| 1236 } // namespace android_webview | 1231 } // namespace android_webview |
| OLD | NEW |