Chromium Code Reviews| 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 "android_webview/browser/aw_browser_context.h" | 7 #include "android_webview/browser/aw_browser_context.h" |
| 8 #include "android_webview/browser/aw_browser_main_parts.h" | 8 #include "android_webview/browser/aw_browser_main_parts.h" |
| 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" | 9 #include "android_webview/browser/gpu_memory_buffer_factory_impl.h" |
| 10 #include "android_webview/browser/in_process_view_renderer.h" | 10 #include "android_webview/browser/in_process_view_renderer.h" |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 139 icon_helper_->SetListener(this); | 139 icon_helper_->SetListener(this); |
| 140 web_contents_->SetUserData(kAwContentsUserDataKey, | 140 web_contents_->SetUserData(kAwContentsUserDataKey, |
| 141 new AwContentsUserData(this)); | 141 new AwContentsUserData(this)); |
| 142 render_view_host_ext_.reset( | 142 render_view_host_ext_.reset( |
| 143 new AwRenderViewHostExt(this, web_contents_.get())); | 143 new AwRenderViewHostExt(this, web_contents_.get())); |
| 144 | 144 |
| 145 AwAutofillManagerDelegate* autofill_manager_delegate = | 145 AwAutofillManagerDelegate* autofill_manager_delegate = |
| 146 AwAutofillManagerDelegate::FromWebContents(web_contents_.get()); | 146 AwAutofillManagerDelegate::FromWebContents(web_contents_.get()); |
| 147 if (autofill_manager_delegate) | 147 if (autofill_manager_delegate) |
| 148 InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); | 148 InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData()); |
| 149 | |
| 150 web_contents_->GetMutableRendererPrefs()->tap_multiple_targets_strategy = | |
| 151 content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE; | |
| 152 } | 149 } |
| 153 | 150 |
| 154 void AwContents::SetJavaPeers(JNIEnv* env, | 151 void AwContents::SetJavaPeers(JNIEnv* env, |
| 155 jobject obj, | 152 jobject obj, |
| 156 jobject aw_contents, | 153 jobject aw_contents, |
| 157 jobject web_contents_delegate, | 154 jobject web_contents_delegate, |
| 158 jobject contents_client_bridge, | 155 jobject contents_client_bridge, |
| 159 jobject io_thread_client, | 156 jobject io_thread_client, |
| 160 jobject intercept_navigation_delegate) { | 157 jobject intercept_navigation_delegate) { |
| 161 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 158 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 207 AwBrowserContext::FromWebContents(web_contents)-> | 204 AwBrowserContext::FromWebContents(web_contents)-> |
| 208 CreateUserPrefServiceIfNecessary(); | 205 CreateUserPrefServiceIfNecessary(); |
| 209 AwAutofillManagerDelegate::CreateForWebContents(web_contents); | 206 AwAutofillManagerDelegate::CreateForWebContents(web_contents); |
| 210 AutofillDriverImpl::CreateForWebContentsAndDelegate( | 207 AutofillDriverImpl::CreateForWebContentsAndDelegate( |
| 211 web_contents, | 208 web_contents, |
| 212 AwAutofillManagerDelegate::FromWebContents(web_contents), | 209 AwAutofillManagerDelegate::FromWebContents(web_contents), |
| 213 l10n_util::GetDefaultLocale(), | 210 l10n_util::GetDefaultLocale(), |
| 214 AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER); | 211 AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER); |
| 215 } | 212 } |
| 216 | 213 |
| 214 void AwContents::SetAndroidWebViewRendererPrefs() { | |
|
boliu
2013/08/29 16:29:59
What calls this and when is it called? Can we guar
benm (inactive)
2013/08/29 16:31:51
Oops, cherry pick fail! please see next PS!
On 20
| |
| 215 content::RendererPreferences* prefs = | |
| 216 web_contents_->GetMutableRendererPrefs(); | |
| 217 prefs->tap_multiple_targets_strategy = | |
| 218 content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE; | |
| 219 prefs->hinting = content::RENDERER_PREFERENCES_HINTING_SLIGHT; | |
| 220 web_contents_->GetRenderViewHost()->SyncRendererPrefs(); | |
| 221 } | |
| 222 | |
| 217 void AwContents::SetAwAutofillManagerDelegate(jobject delegate) { | 223 void AwContents::SetAwAutofillManagerDelegate(jobject delegate) { |
| 218 JNIEnv* env = AttachCurrentThread(); | 224 JNIEnv* env = AttachCurrentThread(); |
| 219 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); | 225 ScopedJavaLocalRef<jobject> obj = java_ref_.get(env); |
| 220 if (obj.is_null()) | 226 if (obj.is_null()) |
| 221 return; | 227 return; |
| 222 Java_AwContents_setAwAutofillManagerDelegate(env, obj.obj(), delegate); | 228 Java_AwContents_setAwAutofillManagerDelegate(env, obj.obj(), delegate); |
| 223 } | 229 } |
| 224 | 230 |
| 225 AwContents::~AwContents() { | 231 AwContents::~AwContents() { |
| 226 DCHECK(AwContents::FromWebContents(web_contents_.get()) == this); | 232 DCHECK(AwContents::FromWebContents(web_contents_.get()) == this); |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 785 browser_view_renderer_->EnableOnNewPicture(enabled); | 791 browser_view_renderer_->EnableOnNewPicture(enabled); |
| 786 } | 792 } |
| 787 | 793 |
| 788 void AwContents::SetJsOnlineProperty(JNIEnv* env, | 794 void AwContents::SetJsOnlineProperty(JNIEnv* env, |
| 789 jobject obj, | 795 jobject obj, |
| 790 jboolean network_up) { | 796 jboolean network_up) { |
| 791 render_view_host_ext_->SetJsOnlineProperty(network_up); | 797 render_view_host_ext_->SetJsOnlineProperty(network_up); |
| 792 } | 798 } |
| 793 | 799 |
| 794 } // namespace android_webview | 800 } // namespace android_webview |
| OLD | NEW |