summaryrefslogtreecommitdiffstats
path: root/chrome
Commit message (Collapse)AuthorAgeFilesLines
* add tls1_1, tls1_2 settings, remove sslv3 fallback code, disable RC4HEADmasterWolfgang Wiedmeyer2015-09-271-0/+14
| | | | Change-Id: I9ab98fbeb040a4a2a0e8ba3c5e260f61303ed199
* Revert "net: networking optimizations"Ricardo Cerqueira2012-11-192-7/+41
| | | | This reverts commit 5fbe95affc8eeed93c678b1d271f64dcc4dd919b.
* net: networking optimizationsEbrahem Qassem2012-09-112-41/+7
| | | | | | | | | | | | | | | features: - early connection - memory cache - caching of redirection - request queue priority - closing unused sockets - SHUTR - fin aggregation - object prefetch - dns host name prioritization Change-Id: Ief90b8206ba48115eaeb12d554424d65f36427ac
* Append client parameter to AutoFill server requests.Ben Murdoch2012-02-161-0/+5
| | | | | Bug: 4515820 Change-Id: I32fe0918c0d9f80f1930a481e47c3e7ce285c329
* fix for bug 5454586, fix up getDbThread()Kristian Monsen2011-10-241-41/+14
| | | | | | | | | Creating a LazyInstance and removing getter function, just using the object that should now be thread safe. Minor indenting change. Change-Id: I9deca3f10d96fdaf655a28b8f4d8db8efdc1803a
* Part of fix for bug 5455901 Add exports needed for autofill and cookiesKristian Monsen2011-10-215-6/+45
| | | | | | | Local only exports due to using of autofill and cookies outside chromium. All changes marked with #ifdef ANDROID Change-Id: I72dcd7fe0fe546073c271663123ba17469deaa83
* Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-141-12/+26
| | | | | | | | | This is an updated version of https://android-git.corp.google.com/g/#/c/141899, which was rolled out, with the lock now static and moved to file scope to match Chromium style. Bug: 5244039 Change-Id: Ic6a6e949b2adc8cf433e6468c1f84ed449af09bc
* Causing webviews to hang.Chris Craik2011-10-131-21/+12
| | | | | Revert "Fix SQLitePersistentCookieStore's getDbThread() to be threadsafe" This reverts commit 47f5154a4217fb3626326224fc1c7d3c9918dd09
* Fix SQLitePersistentCookieStore's getDbThread() to be threadsafeSteve Block2011-10-131-12/+21
| | | | | Bug: 5244039 Change-Id: I2d4f66b2f5e64c2cab247574cdfd8fa2d707cad8
* Preparation for fixing bug 5065047: build libchromium as a shared libKristian Monsen2011-07-283-12/+0
| | | | | | Use FormField from chromium instead of Android. Change-Id: I63565da382ea5dd10e7aed57a5a0f47293d160a0
* Merge Chromium at 12.0.742.130: Initial merge by gitKristian Monsen2011-07-2633-295/+754
| | | | | | Fix for bug 5080607 Update external/chromium to latest revision Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
* Query the platform for the Autofill server URL.Ben Murdoch2011-07-211-0/+14
| | | | | | | | | | The URL to use to make autofill requests is now configured by the platform. Add a JNI call to retrieve it. See also frameworks/base change I0aa85c5bef834b1120baaabdc2dd2e4e607a63b6 Bug: 4515820 Change-Id: I3a22ae42402f52207eee2d0d9df64700cb7c9f45
* Implement AutofillCountry::ApplicationLocale() on Android.Ben Murdoch2011-07-131-3/+1
| | | | | | | Call JNI to determine the current locale for the system. Bug: 4959752 Change-Id: I6429239356842175599f1f458c77226b933a8c26
* Return en-US rather than empty string for current locale.Ben Murdoch2011-07-121-1/+2
| | | | | | | | | The current locale is expected to be non-empty. Until we hook up JNI to determine the correct current locale, default to en-US. Bug: 4959752 Change-Id: I7a9cdcd743fad002818956dc2d6dd3b8003b4297
* Merge Chromium at r12.0.742.93: All autofill fixesKristian Monsen2011-07-086-245/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLRequestContextGetter moved to net and the net namespace, http://codereview.chromium.org/6778025: profile_android.cc profile_android.h autofill_download.cc Files moved from base/ to base/memory, http://codereview.chromium.org/6714032: profile_android.h New functions in profile.h: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=78300&r2=78301 http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/profiles/profile.h?view=diff&pathrev=88489&r1=81769&r2=81770 profile_android.h autofill_country.cc: Removed code where we had local changes: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_country.cc?r1=77402&r2=77780&pathrev=88489 AutoFill -> Autofill renaming: autofill_download.cc autofill_manager.cc autofill_manager.h personal_data_manager.cc credit_card.cc Method with local change removed upstream, part of the removed code added to an existing method. http://codereview.chromium.org/6690038 autofill_manager.cc Using TabContentsWrapper: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=88489&r1=79171&r2=79172 OnShowAutofillDialog is ifdef out by Android, so taking upstream. IsAutofillEnabled, Android has just ifdef return true, so taking upstream. Change-Id: I87bfd814592aaed074d00716df355fba7be3984d
* Merge Chromium at r12.0.742.93: Various profile.h compile fixesKristian Monsen2011-07-081-0/+14
| | | | | | | | | | | | | Not including chrome/common/extensions/extension.h, the main reason is that this includes UserScript, which crashes with WebCore code. Forward declaring needed struct. ifdef out GetResourceContext as it returns a const content::ResourceContext&. We cannot create this without including the file, which are not in the android chromium tree. Change-Id: I3540894d5e590ac7decea92c0ef0562e622222e5
* Merge Chromium at r12.0.742.93: Compile fixes, add virtual destructorsKristian Monsen2011-07-083-0/+9
| | | | | | | New classes with virtual functions, but not virtual destructors. This does not compile on Android, so adding them. Change-Id: Ic9497dd6f83b7f3bafbab708e15ffd6507e82390
* Merge Chromium at r12.0.742.93: Compile fixes from moving ↵Kristian Monsen2011-07-082-2/+2
| | | | | | | url_request_context_getter Change-Id: I9daca7590633f466d3066e359a3bb8c6d29d6d19 http://codereview.chromium.org/6778025
* Merge Chromium at r12.0.742.93: Fix conflicts in web_data_service.hKristian Monsen2011-07-081-6/+0
| | | | | | | Upstream changed include to forward declearing a struct http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/webdata/web_data_service.h?r1=77630&r2=78215&pathrev=88489 Change-Id: If1e2609b3f22f521448e044efa666af3cda3c72b
* Merge Chromium at r12.0.742.93: Fix conflicts in ↵Kristian Monsen2011-07-081-10/+4
| | | | | | | | | sqlite_persistent_cookie_store.cc Change close to local edit, simplified local change a bit: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/net/sqlite_persistent_cookie_store.cc?view=diff&pathrev=88489&r1=82094&r2=82095 Change-Id: I89c277744c9cdcd95a40ab7fb9dbc363dff487f8
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-084297-189356/+203693
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Compile fixes in autofill_country.ccKristian Monsen2011-06-301-4/+17
| | | | | | | Leaving some issues open as they need a jni implementation. Tracked by http://b/issue?id=4959752 Change-Id: Id413fd203aeb3ba8b33f9f11140bab620ddc7f0e
* Merge Chromium at r11.0.696.0: Compile fix in web_data_service.hKristian Monsen2011-06-301-0/+5
| | | | | | Adding includes that are no longer indirectly included on Android Change-Id: Ib52b786310342220e975fe868c8e5e862886d24d
* Merge Chromium at r11.0.696.0: Compile fixes, removing dependencies on new ↵Kristian Monsen2011-06-303-6/+9
| | | | | | | | | content directory Also using TabContentsObserver since we now have that in Android. Change-Id: I430a5f5ac67630b0164a07e27a686f472a725d58
* Merge Chromium at r11.0.696.0: Fix conflict in personal_data_manager.ccKristian Monsen2011-06-301-22/+1
| | | | | | | | | | Upstream change close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/personal_data_manager.cc?view=diff&pathrev=77261&r1=77030&r2=77031 Function with local edits removed upstream: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/personal_data_manager.cc?r1=74210&r2=75028&pathrev=77261 Change-Id: Id025c860d56f10233f8f8f26cf41af0f1640972b
* Merge Chromium at r11.0.696.0: Fix conflicts in AutofillKristian Monsen2011-06-303-94/+21
| | | | | | | | | | | | | | | | | | | | Autofill renaming: http://codereview.chromium.org/6626042 http://codereview.chromium.org/6625033 http://codereview.chromium.org/6621008 http://codereview.chromium.org/6602001 http://codereview.chromium.org/6591029 Change inside an #ifdef: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=77261&r1=77212&r2=77213 Include moved: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.h?r1=76330&r2=76512&pathrev=77261 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=77261&r1=76476&r2=76477 TabContents changed to function: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.h?r1=74360&r2=75226&pathrev=77261 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=77261&r1=75225&r2=75226
* Merge Chromium at r11.0.696.0: Fix conflict in autofill_download.hKristian Monsen2011-06-291-4/+0
| | | | | | | Small edit close to local change: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.h?r1=76196&r2=76330&pathrev=77261 Change-Id: Ife93ddd73cd31a925b542c7685535b70f69c5408
* Merge Chromium at r11.0.696.0: Fix conflict in web_data_service.hKristian Monsen2011-06-291-6/+10
| | | | | | | Include moved upstream close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/webdata/web_data_service.h?view=diff&pathrev=77261&r1=76389&r2=76390 Change-Id: Ie7324aa01e70a66ce62ed0cca0f8b923c942c89f
* Merge Chromium at r11.0.696.0: Fix conflict in sqlite_presistent_cookie_store.ccKristian Monsen2011-06-291-8/+3
| | | | | | | | Added includes close to Android guard: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/net/sqlite_persistent_cookie_store.cc?view=diff&pathrev=77261&r1=76386&r2=76387 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/net/sqlite_persistent_cookie_store.cc?view=diff&pathrev=77261&r1=75889&r2=75890 Change-Id: I1c9751069e23f6bdd7404b7ea8818a07efe47265
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-293455-165581/+118542
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge "Remove unnecessary forward declaration"Ben Murdoch2011-06-151-1/+0
|\
| * Remove unnecessary forward declarationBen Murdoch2011-06-161-1/+0
| | | | | | | | Change-Id: I045d7c690d707ecca573c1d5d64b12dad1b058e1
* | Merge "Remove unnecessary passing of unused parameter"Ben Murdoch2011-06-151-3/+2
|\ \ | |/
| * Remove unnecessary passing of unused parameterBen Murdoch2011-06-161-3/+2
| | | | | | | | Change-Id: If349cd2ffd56b9f539d4ebdb8944964fc57289e5
* | Removing local changes from chrome/browser/prefsKristian Monsen2011-06-164-58/+1
| | | | | | | | | | | | After this we are matching upstream Change-Id: Ifae1c3935157d49f95c271bf6a5e00b8ce434fe3
* | Removing all prefs usage for Android in autofillKristian Monsen2011-06-153-0/+12
|/ | | | | | | | | | We do not use any of the functionality that is removed with #ifdef's. Will remove local changes in the prefs files in a later CL. Change-Id: I242f785ecf7618206d9f890aa4e78d4d09482a24
* Remove guards for upstreamed changeKristian Monsen2011-06-141-4/+0
| | | | | | | Landed upstream in: http://codereview.chromium.org/6349074/ Change-Id: I36d9200720efa2454a1c75e430e12c3d51c27b5f
* Merge Chromium at r11.0.672.0: Compile fixes in pref_service.ccKristian Monsen2011-06-141-1/+11
| | | | | | | | | | | | | | | | Avoid including configuration_policy_pref_store.h as that depends on autogenerated files (and is not needed). That also meant we had to remove a using statement. http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/policy/configuration_policy_store_interface.h?view=diff&pathrev=74924&r1=72955&r2=72956 Two new arguments to the CTOR: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&pathrev=74924&r1=72488&r2=72489 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&pathrev=74924&r1=73865&r2=73866 New constructor added, made android modifications: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72488&r2=72489 Change-Id: I667a68039f4c78a740b99f7b1086943dfcd9ae65
* Merge Chromium at r11.0.672.0: Compile fix in autofill_manager.*Kristian Monsen2011-06-142-2/+68
| | | | | | | | | | | Major refactoring upstream created some problems: http://codereview.chromium.org/5958021 Created wrapper functions so private functions can be called from our webkit. Also needed one of the functions to return a bool like they used to. Change-Id: Ia6df2c264f9dc48cfbfb7f33732783ed2a329758
* Merge Chromium at r11.0.672.0: Fix conflicts in pref_value_store.ccKristian Monsen2011-06-141-23/+1
| | | | | | | Upstream change close to local commit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.cc?view=diff&pathrev=74924&r1=72786&r2=72787 Change-Id: Ic2f680446e0bc5ff84edc91bc22c2b287638c81d
* Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.ccKristian Monsen2011-06-141-37/+7
| | | | | | | | | | | | | | | | Header move close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72226&r2=72227 Renamed variable close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=73865&r2=73866 New function close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72488&r2=72489 New function close to local edits: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&pathrev=74924&r1=72488&r2=72489 Change-Id: Idcad89f587b1e74310f92094d3622185e9c524aa
* Merge Chromium at r11.0.672.0: Fix conflicts in personal_data_manager.ccKristian Monsen2011-06-141-31/+6
| | | | | | | | | | | | | Added extra argument to function close to local edit in two places: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/personal_data_manager.cc?view=diff&pathrev=74924&r1=73869&r2=73870 Function removed closed to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/personal_data_manager.cc?r1=73660&r2=73870&pathrev=74924 Not sure why the last conflict got there, but must be caused by this CL: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/personal_data_manager.cc?view=diff&pathrev=74924&r1=74209&r2=74210 Change-Id: Ia2d53e01c519f0a6f4bc4a56486959e3e55a8b21
* Merge Chromium at r11.0.672.0: Fix conflicts in autofill_manager.*Kristian Monsen2011-06-142-84/+11
| | | | | | | | | | | | | | | | | New header added close to #ifndef ANDROID, we also don't want it: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=74924&r1=70913&r2=70914 Also exluding chrome/browser/ui/browser_list.h from same CL. Major refactoring: http://codereview.chromium.org/5958021 Now inherits from TabContentsObserver (but not in Android): http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.h?view=diff&pathrev=74924&r1=72915&r2=72916 upload_form_structure_ was removed close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.h?r1=71282&r2=72004&pathrev=74924 Change-Id: Ifd158f1aca8b5de661ab6279d5f8ce3fce742806
* Merge Chromium at r11.0.672.0: Fix conflicts in autofill_downlad.ccKristian Monsen2011-06-141-10/+0
| | | | | | | | | | | | Local commit between two remote changes: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=74924&r1=72584&r2=72585 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=74924&r1=72787&r2=72788 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?r1=73232&r2=73921&pathrev=77261 Android doesn't need to be forced into the list as official build anymore since autofill is enabled for all versions. Change-Id: I13ae0d9724d61f49aba5fc4108605cd4921c8345
* Merge Chromium at r11.0.672.0: Fix conflicts in pref_service.hKristian Monsen2011-06-141-4/+1
| | | | | | | Upstream change close to local edit: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?r1=70351&r2=72489&pathrev=74924 Change-Id: Ie63b95f5e21893a79f764509a5020017c7da08e9
* Merge Chromium at r11.0.672.0: Fix conflicts in autofill_dialog.hKristian Monsen2011-06-141-5/+1
| | | | | | | gfx/* moved to ui/gfx/* upstream: http://codereview.chromium.org/6312156 Change-Id: Icbc82026a2496a0a7ddbd0069b558973ba7ec620
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-144168-163327/+212975
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Reduce pref usage by autofillKristian Monsen2011-06-142-0/+15
| | | | | | | | | | | | Try to avoid using prefs in Android. We are not using the entire system, and we have significant local edits. Will try to remove the local edits in prefs and keep them in autofill. We should not loose any functionality as there is no way for the user to change the prefs. Change-Id: I5ee38228fa552127a0399390a617e1a324e75d86
* Merge Chromium at 10.0.634.0: Fix conflict and compile from thread.h moveKristian Monsen2011-05-251-5/+1
| | | | | | | thread.h was moved in this CL: http://codereview.chromium.org/6028009 Change-Id: I19110c2c356d07b3e3bd5256161bec45c21c057f
* Merge Chromium at 10.0.634.0: Fix conflicts in autofillKristian Monsen2011-05-255-39/+0
| | | | | | | | | | Catching up with our autofill cherry-picks: http://codereview.chromium.org/6026010 A new constant IDS_AUTOFILL_FAX_RE was introduced: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710 Change-Id: I5db292e315044aa9a72de5caf39350e654aa1626
generated by cgit v1.1 at 2024-12-22 09:33:06 +0000