android_webview/lib/main/webview_jni_onload.cc - Issue 1890203002: Implement Web Restrictions in WebView.

Side by Side Diff: android_webview/lib/main/webview_jni_onload.cc

Issue 1890203002: Implement Web Restrictions in WebView. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Yet another manual rebase! Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 // Copyright 2015 The Chromium Authors. All rights reserved.	1 // Copyright 2015 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/lib/main/webview_jni_onload.h"	5 #include "android_webview/lib/main/webview_jni_onload.h"

6	6

7 #include "android_webview/common/aw_version_info_values.h"	7 #include "android_webview/common/aw_version_info_values.h"

8 #include "android_webview/lib/main/aw_main_delegate.h"	8 #include "android_webview/lib/main/aw_main_delegate.h"

9 #include "android_webview/native/android_webview_jni_registrar.h"	9 #include "android_webview/native/android_webview_jni_registrar.h"

10 #include "base/android/jni_android.h"	10 #include "base/android/jni_android.h"

11 #include "base/android/jni_registrar.h"	11 #include "base/android/jni_registrar.h"

12 #include "base/android/library_loader/library_loader_hooks.h"	12 #include "base/android/library_loader/library_loader_hooks.h"

13 #include "base/bind.h"	13 #include "base/bind.h"

14 #include "components/external_video_surface/component_jni_registrar.h"	14 #include "components/external_video_surface/component_jni_registrar.h"

15 #include "components/web_contents_delegate_android/component_jni_registrar.h"	15 #include "components/web_contents_delegate_android/component_jni_registrar.h"

	16 #include "components/web_restrictions/browser/web_restrictions_client.h"
	Torne 2016/08/17 18:20:55 nit: no need to add these now that they don't defi nit: no need to add these now that they don't define JNI registration functions :) aberent 2016/08/18 09:39:59 Done. Show quoted text On 2016/08/17 18:20:55, Torne wrote: > nit: no need to add these now that they don't define JNI registration functions > :) Done.
	17 #include "components/web_restrictions/browser/web_restrictions_client_result.h"

16 #include "content/public/app/content_jni_onload.h"	18 #include "content/public/app/content_jni_onload.h"

17 #include "content/public/app/content_main.h"	19 #include "content/public/app/content_main.h"

18 #include "url/url_util.h"	20 #include "url/url_util.h"

19	21

20 namespace android_webview {	22 namespace android_webview {

21	23

22 namespace {	24 namespace {

23	25

24 static base::android::RegistrationMethod	26 static base::android::RegistrationMethod

25 kWebViewDependencyRegisteredMethods[] = {	27 kWebViewDependencyRegisteredMethods[] = {

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks);	64 return content::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks);

63 }	65 }

64	66

65 bool OnJNIOnLoadInit() {	67 bool OnJNIOnLoadInit() {

66 std::vector<base::android::InitCallback> init_callbacks;	68 std::vector<base::android::InitCallback> init_callbacks;

67 init_callbacks.push_back(base::Bind(&Init));	69 init_callbacks.push_back(base::Bind(&Init));

68 return content::android::OnJNIOnLoadInit(init_callbacks);	70 return content::android::OnJNIOnLoadInit(init_callbacks);

69 }	71 }

70	72

71 } // android_webview	73 } // android_webview

OLD	NEW