Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1093)

Unified Diff: content/browser/android/browser_jni_registrar.cc

Issue 920693003: Revert "Revert of [Android] Migrate javascript settings to a content setting from a pref. (patchset… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove jni registration Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: content/browser/android/browser_jni_registrar.cc
diff --git a/content/browser/android/browser_jni_registrar.cc b/content/browser/android/browser_jni_registrar.cc
index 9db3c6f40d35c05f29fe39438bc64b3affca0990..02cfceb805e202025572e5466df3cc9cc769dcd3 100644
--- a/content/browser/android/browser_jni_registrar.cc
+++ b/content/browser/android/browser_jni_registrar.cc
@@ -12,7 +12,6 @@
#include "content/browser/android/child_process_launcher_android.h"
#include "content/browser/android/composited_touch_handle_drawable.h"
#include "content/browser/android/content_readback_handler.h"
-#include "content/browser/android/content_settings.h"
#include "content/browser/android/content_video_view.h"
#include "content/browser/android/content_view_core_impl.h"
#include "content/browser/android/content_view_render_view.h"
@@ -52,7 +51,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = {
{"ChildProcessLauncher", content::RegisterChildProcessLauncher},
{"ContentReadbackHandler",
content::ContentReadbackHandler::RegisterContentReadbackHandler},
- {"ContentSettings", content::ContentSettings::RegisterContentSettings},
{"ContentVideoView", content::ContentVideoView::RegisterContentVideoView},
{"ContentViewCore", content::RegisterContentViewCore},
{"ContentViewRenderView",
« no previous file with comments | « chrome/browser/android/preferences/pref_service_bridge.cc ('k') | content/browser/android/content_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698