diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 16:56:09 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-19 16:56:09 +0000 |
| commit | d0924cb339decdcc5d9924bae3550e2531d48207 (patch) | |
| tree | 264b19ca050b454ff4890f5f06f1d007e76386a6 /content/content_jni.gypi | |
| parent | b0ddd14c6fef8a42cd922ff62dce62fb3e89439e (diff) | |
| download | chromium_src-d0924cb339decdcc5d9924bae3550e2531d48207.zip chromium_src-d0924cb339decdcc5d9924bae3550e2531d48207.tar.gz chromium_src-d0924cb339decdcc5d9924bae3550e2531d48207.tar.bz2 | |
Upstream most of the user agent code for Android.
Brought along most of the command-line start-up switches.
As for requiring the InitUserAgent (and not just having the
logic in webkit/glue/user_agent), that's because currently unit tests
can't access Java code directly. Using pseudo dependency-injection
allows this to work for prod and test. Once apk-based tests are online,
we can remove this.
Review URL: https://chromiumcodereview.appspot.com/10473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142974 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 0ab5255..21acb5a 100644 --- a/content/content_jni.gypi +++ b/content/content_jni.gypi @@ -12,6 +12,7 @@ 'public/android/java/org/chromium/content/app/ContentMain.java', 'public/android/java/org/chromium/content/app/LibraryLoader.java', 'public/android/java/org/chromium/content/app/SandboxedProcessService.java', + 'public/android/java/org/chromium/content/app/UserAgent.java', 'public/android/java/org/chromium/content/browser/AndroidBrowserProcess.java', 'public/android/java/org/chromium/content/browser/ContentView.java', 'public/android/java/org/chromium/content/browser/ContentViewClient.java', @@ -29,6 +30,7 @@ '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_main_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/library_loader_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/sandboxed_process_service_jni.h', + '<(SHARED_INTERMEDIATE_DIR)/content/jni/user_agent_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/android_browser_process_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_jni.h', '<(SHARED_INTERMEDIATE_DIR)/content/jni/content_view_client_jni.h', |