diff options
| author | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 18:45:00 +0000 |
|---|---|---|
| committer | tedchoc@chromium.org <tedchoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-20 18:45:00 +0000 |
| commit | ca6b8608f99aff601b7899d89aa1b748f855fc83 (patch) | |
| tree | da2bef2339fec03787f08536ee703724f62056e0 /content/content_jni.gypi | |
| parent | 4529c84eac99324912c3ad0418b20e56d2782c77 (diff) | |
| download | chromium_src-ca6b8608f99aff601b7899d89aa1b748f855fc83.zip chromium_src-ca6b8608f99aff601b7899d89aa1b748f855fc83.tar.gz chromium_src-ca6b8608f99aff601b7899d89aa1b748f855fc83.tar.bz2 | |
Upstream WebSettings and ZoomManager for ContentShell.
WebSettings has dependencies on ZoomManager, so it is easier to bring them
up together.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10573020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143214 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_jni.gypi')
| -rw-r--r-- | content/content_jni.gypi | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_jni.gypi b/content/content_jni.gypi index 21acb5a..9b0054c 100644 --- a/content/content_jni.gypi +++ b/content/content_jni.gypi @@ -22,6 +22,7 @@ 'public/android/java/org/chromium/content/browser/LocationProvider.java', 'public/android/java/org/chromium/content/browser/SandboxedProcessLauncher.java', 'public/android/java/org/chromium/content/browser/TouchPoint.java', + 'public/android/java/org/chromium/content/browser/WebSettings.java', 'public/android/java/org/chromium/content/common/CommandLine.java', 'public/android/java/org/chromium/content/common/SurfaceCallback.java', 'public/android/java/org/chromium/content/common/TraceEvent.java', @@ -40,6 +41,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_launcher_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/touch_point_jni.h', + '<(SHARED_INTERMEDIATE_DIR)/content/jni/web_settings_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/command_line_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/surface_callback_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/trace_event_jni.h', |