diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 17:44:11 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-27 17:44:11 +0000 |
| commit | fc05a93521b21e927948fe9ee21fc4d766eb67af (patch) | |
| tree | d86e5ea024186e5c3da3c72a24d2349d8c7679a9 /content/app | |
| parent | 0486474774bd8d62b010fe99482694001f0f745d (diff) | |
| download | chromium_src-fc05a93521b21e927948fe9ee21fc4d766eb67af.zip chromium_src-fc05a93521b21e927948fe9ee21fc4d766eb67af.tar.gz chromium_src-fc05a93521b21e927948fe9ee21fc4d766eb67af.tar.bz2 | |
[Android] Rename WebSettings to ContentSettings.
This renames the Android WebSettings class to ContentSettings.
The naming change is related to downstream refactoring.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10700005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144485 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
| -rw-r--r-- | content/app/android/content_jni_registrar.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/app/android/content_jni_registrar.cc b/content/app/android/content_jni_registrar.cc index 3ac6dc2..fbc6110 100644 --- a/content/app/android/content_jni_registrar.cc +++ b/content/app/android/content_jni_registrar.cc @@ -10,13 +10,13 @@ #include "content/app/android/sandboxed_process_service.h" #include "content/app/android/user_agent.h" #include "content/browser/android/android_browser_process.h" +#include "content/browser/android/content_settings.h" #include "content/browser/android/content_view_client.h" #include "content/browser/android/content_view_impl.h" #include "content/browser/android/device_info.h" #include "content/browser/android/download_controller.h" #include "content/browser/android/sandboxed_process_launcher.h" #include "content/browser/android/touch_point.h" -#include "content/browser/android/web_settings.h" #include "content/common/android/command_line.h" #include "content/common/android/surface_callback.h" #include "content/common/android/trace_event_binding.h" @@ -27,6 +27,7 @@ namespace android { base::android::RegistrationMethod kContentRegisteredMethods[] = { { "AndroidBrowserProcess", content::RegisterAndroidBrowserProcess }, { "CommandLine", RegisterCommandLine }, + { "ContentSettings", ContentSettings::RegisterContentSettings }, { "ContentView", RegisterContentView }, { "ContentViewClient", RegisterContentViewClient }, { "ContentMain", content::RegisterContentMain }, @@ -38,7 +39,6 @@ base::android::RegistrationMethod kContentRegisteredMethods[] = { { "TouchPoint", content::RegisterTouchPoint }, { "TraceEvent", RegisterTraceEvent }, { "UserAgent", content::RegisterUserAgent }, - { "WebSettings", WebSettings::RegisterWebSettings }, }; bool RegisterJni(JNIEnv* env) { |