summaryrefslogtreecommitdiffstats
path: root/content/content_app.gypi
diff options
context:
space:
mode:
authoryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 16:56:09 +0000
committeryfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-19 16:56:09 +0000
commitd0924cb339decdcc5d9924bae3550e2531d48207 (patch)
tree264b19ca050b454ff4890f5f06f1d007e76386a6 /content/content_app.gypi
parentb0ddd14c6fef8a42cd922ff62dce62fb3e89439e (diff)
downloadchromium_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_app.gypi')
-rw-r--r--content/content_app.gypi2
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content_app.gypi b/content/content_app.gypi
index dcd5392..11f4f28 100644
--- a/content/content_app.gypi
+++ b/content/content_app.gypi
@@ -20,6 +20,8 @@
'app/android/library_loader_hooks.cc',
'app/android/sandboxed_process_service.cc',
'app/android/sandboxed_process_service.h',
+ 'app/android/user_agent.cc',
+ 'app/android/user_agent.h',
'app/content_main.cc',
'app/content_main_runner.cc',
'app/startup_helper_win.cc',