summaryrefslogtreecommitdiffstats
path: root/chrome
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-251244-9529/+15736
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge changes I17af2234,I46f12b11,I53e91650,Ia924ea7c,Icd55c23eKristian Monsen2011-05-239-27/+8
|\ | | | | | | | | | | | | | | | | * changes: Remove #ifdef ANDROID for cherry-pick First pass at removing local changes from autofill Removing the NullProxy, better Android implementation Remove local changes in unused proxy_config_service_linux.h Removing local changes that strip out vlog
| * Remove #ifdef ANDROID for cherry-pickKristian Monsen2011-05-231-2/+0
| | | | | | | | | | | | | | This is now a cherry-pick of: http://codereview.chromium.org/7051012/ Change-Id: I17af22348ae2c62cf15447e7a2158384913dc7e5
| * First pass at removing local changes from autofillKristian Monsen2011-05-238-25/+8
| | | | | | | | | | | | Mostly fixing headers Change-Id: I46f12b1157ed27905db621d88dfa59611aa58595
* | Fix for bug 4466763: Browser crashes after performing some activityKristian Monsen2011-05-231-0/+4
|/ | | | | | | Android doesn't create a PrefNotifier, it is used withouta NULL check. Called a function on pref_notifier_, which was NULL. Change-Id: I9143dd56531f2410b57ae462b4597f90782c5817
* Merge Chromium at 10.0.621.0: Fix linker errorKristian Monsen2011-05-201-0/+3
| | | | | | | Add the profile constructor here so we don't have to compile the whole file. Change-Id: If8df058eba89c3d1fdb3815ca3a141f8c5fa2c4e
* Merge Chromium at 10.0.621.0: profile.h moved upstreamKristian Monsen2011-05-202-6/+2
| | | | | | | profile.h has moved upstream http://codereview.chromium.org/5606002 Change-Id: Ib1652546f185ff862a39ebb3e77c9678c78dbaac
* Merge Chromium at 10.0.621.0: Fix conflicts in pref_service.*Kristian Monsen2011-05-202-55/+21
| | | | | | | | | | | | Large upstream changes close to local commits. CL's that caused the conflict: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?r1=68736&r2=70050 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?r1=68355&r2=68574 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?view=diff&r1=68735&r2=68736 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.cc?r1=68355&r2=68574 Change-Id: I7bc23c57ea81468f0ba95fb49c35d312c13e6bf8
* Merge Chromium at 10.0.621.0: Fix conflicts in pref_value_store.*Kristian Monsen2011-05-202-220/+3
| | | | | | | | | | | Large upstream changes. Matching upstream now, with a local change that will be upstreamed. Mostly due to these CL's http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.h?r1=68355&r2=68574 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_value_store.h?r1=68736&r2=70050 Change-Id: I62bea1d4e4314b379ee823bb505412b049c8c17b
* Merge Chromium at 10.0.621.0: Fix conflicts in autofillKristian Monsen2011-05-203-29/+6
| | | | | | | | | | | | | | | Upstream patches close to local changes. autofill_profile.cc: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_profile.cc?view=diff&r1=69346&r2=69347 credit_card.cc: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/credit_card.cc?view=diff&r1=69346&r2=69347 name_field.cc: Not sure why the conflict is there, but Android needs to include the extra l10n_util.h header Change-Id: Ia5e76f8423109931ca53d52fbbe936e3f7c489c0
* Merge Chromium at 10.0.621.0: Fix conflict in autofill_download.hKristian Monsen2011-05-201-3/+0
| | | | | | | | | Upstream change close to local change. CL: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.h?view=diff&r1=69231&r2=69232 Change-Id: I3a810578f42721fb2aa35dfbb9c737301f7ab927
* Merge Chromium at 10.0.621.0: Fix conflict in pref_service.hKristian Monsen2011-05-201-10/+2
| | | | | | | | | | Upstream changes close to local changes CLs: http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&r1=68156&r2=68157 http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/prefs/pref_service.h?view=diff&r1=68573&r2=68574 Change-Id: I74a450afcb9de01317046493899553b94a654e47
* Merge Chromium at 10.0.621.0: Fix conflict in sqlite_persistent_cookie_store.*Kristian Monsen2011-05-202-265/+43
| | | | | | | | | | Multiple conflicts, this was a bit complex. Mostly from: http://codereview.chromium.org/5365010 http://codereview.chromium.org/5430004 Change-Id: I80ff3ede43500bc680e6d3b75d7727b482c176e1
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-163716-161859/+179117
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Localise autofill regular expressionsBen Murdoch2011-02-285-50/+88
| | | | | | | | | | | | | | Improve the AutoFill experience on non-English pages by reading localised regular expressions from Java instead of using hard-coded English ones. This is essentially a cherry pick of Chromium CL: http://codereview.chromium.org/6026010/ Requires a change in frameworks/base, see: I9c0544e67bf0333abcb9ea607855ff92f69bff8e Change-Id: Ie927514cae7b7390c5a291dfae4dcfe3782bb5b7
* Part of fix for bug 3424424 Browser hangingKristian Monsen2011-02-181-1/+9
| | | | | | Make sure we always post completed message. Change-Id: I21a57176858bdf90e8a974cfea82ddc5ef104935
* Merge Chromium at 9.0.597.106Steve Block2011-02-1811-77/+198
| | | | | | This is branches/597 at r74919. Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
* Fix for bug 3343875 index cookie_times exists logcat errorKristian Monsen2011-02-011-0/+4
| | | | | | Only creating the index if it doesn't exist Change-Id: Ib1b975f9c413bb817df9b3e70d72161319c643f9
* Merge Chromium at 9.0.597.83: Trivial merge by GitBen Murdoch2011-01-2523-83/+1617
| | | | Change-Id: Ib650207b150b49b604e6fd25a20d7ed7a6de9afc
* Merge Chromium at 9.0.597.76: Trivial merge by GitBen Murdoch2011-01-205-79/+37
| | | | Change-Id: I3a36375821806209cd5c303c78225428396c5010
* Merge Chromium at 9.0.597.69: Trivial merge by Git.Ben Murdoch2011-01-16146-1491/+2257
| | | | | | /branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
* Merge Chromium at 9.0.597.55: Fix RenderViewHost/AutoFillHost conflictBen Murdoch2011-01-112-0/+20
| | | | | | See http://src.chromium.org/viewvc/chrome?view=rev&revision=67599 Change-Id: Ibbc3734519f0de3f18492f319fa1c558c835a007
* Merge chromium at 9.0.597.55: Fix conflicts.Ben Murdoch2011-01-114-75/+7
| | | | | | | | | | | | | | | tab_contents.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=67659 pref_value_store.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=66755 base_paths_linux.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=67202 personal_data_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=67344 autofill_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=67599 Change-Id: I7016d521fa2f2f13d0c50e5609b72ceaae64d8f0
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-111122-15514/+118337
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Fix memory leak in TabContents.Iain Merrick2011-01-071-3/+4
| | | | | | | | | TabContents was leaking a Profile object. The user-visible effect of this was that incognito browsing state was not cleared correctly after closing the last tab if AutoFill was used. Bug: 3324425 Change-Id: I06b3c2de10a8763d0d8e88d8aef75f6da846aafc
* Fix crash in AutoFillBen Murdoch2010-12-204-0/+19
| | | | | | | | | | | | | | | | We recently changed WebKit to use one URLRequestContext per WebView. However AutoFill did not get migrated to the new system and so we have observed crashes due to a dangling pointer. We have one AutoFill object per WebView and hence one Profile object per webview. we access the URLRequestContext through the Profile so inject the correct context in when the AutoFill object is created. Needs a change in external/webkit, see Iace23ae8c0240f0134894c12d2f7281161aa6150 Bug: 3291654 Change-Id: I004ab7ac9c6a72be1b62aa8e44322b97a371c136
* Add GetCookieCount() method to SQLitePersistentCookieStore.Iain Merrick2010-12-062-2/+43
| | | | | | | | | This is needed to implement the framework method CookieManager.hasCookies(), which checks whether the cookies have actually been saved to flash. To avoid yet more inter-thread messaging, I use a counter that gets updated during each Commit() call. Change-Id: Id498d28151dadcaa2dea11852b73d05a585774f1
* Add a completion callback to CookieMonster::FlushStore.Iain Merrick2010-12-062-13/+32
| | | | | | | | | | | | | This matches a change I currently have under review in upstream Chromium (see http://codereview.chromium.org/5365010/). FlushStore now takes a Task* parameter, which is posted when the operation completes. However, FlushStore must now be called on a Chrome-owned thread as it may need to post the task to itself! I've updated the glue code in external/webkit -- see change I008f35d1. Change-Id: Ieb3e787b823d0a8adb5de447c52050278610fe4f
* Merge Chromium at r66597: Fix strangeness in permission_warnings.htmlBen Murdoch2010-12-031-4/+0
| | | | | | Git seems to have got confused in the merge. Change-Id: Ifb10f7f0d5c248270b42f1ac969a44216de9a65b
* Merge Chromium at r66597: Remove AutoFill warning messages on Android.Ben Murdoch2010-12-032-1/+7
| | | | | | | | | | | | We do not use the warning messages added in Chromium r66237, so remove them. Also remove the queryId parameter that was removed upstream in the same change. See http://src.chromium.org/viewvc/chrome?view=rev&revision=66237 Change-Id: Ia3330943c617fdce9288bec98e621ab22c1f7b5d
* Merge Chromium at r66597: Fix conflicts.Ben Murdoch2010-12-033-61/+4
| | | | | | | | | | | | | | | | build_config.h http://src.chromium.org/viewvc/chrome?view=rev&revision=65920 pref_value_store.cc|h http://src.chromium.org/viewvc/chrome?view=rev&revision=66426 personal_data_manager.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=65830 x509_certificate_openssl.cc http://src.chromium.org/viewvc/chrome?view=rev&revision=66413 Change-Id: I2eab5c3e50a2fa4d79da023049681d36ca4bc0da
* Merge Chromium at r66597: Initial merge by git.Ben Murdoch2010-12-031572-27530/+45900
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Add Flush() method to cookie store.Iain Merrick2010-11-302-0/+33
| | | | | | | | | | We'll use this on Android to sync cookies when the app is sent to the background. This will help avoid data loss if the app is shut down before the 30-second sync timer fires. Bug: 3231371 Change-Id: Ie600c588e3936fb14250f0e3b5b347815e4fd725
* Persist session cookies on Android.Iain Merrick2010-11-251-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tricky bit here is that the SQLite schema assumes expires_utc will always be set. Our SQL API doesn't have good support for null columns, so I'm using a sentinel value of 0 for session cookies. This seems reasonably clean, and avoids a schema change. Most of the save/restore logic is in the Browser app. All we're doing here is ensuring that session cookies *can* be saved. To test that session cookies survive a clean browser exit: 1. Go to a site that sets a session cookie. 2. Wait 30 seconds for the cookie DB to be flushed. 3. Press the home button. 4. Kill the browser (adb shell kill <PID>) 5. Open the browser again; session should have survived. To test that session cookies do *not* survive a forced exit: 1. Set a session cookie, wait 30 seconds. 2. Do NOT press the home button, just kill the browser. 3. Open the browser again; session should be destroyed. It would be good to flush the cookie DB immediately when the browser is paused, but I'll do that in a separate CL. Bug: 2864791 Change-Id: I241b471b86b8b5bb6593c7e78f6f0b8c83850e48
* Merge Chromium at r65505: Update profile label creationBen Murdoch2010-11-191-8/+2
| | | | | | | | | AutoFill has changed how to produce labels for Profiles. We previously had some of this code ifdef'd out. http://src.chromium.org/viewvc/chrome?view=rev&revision=63806 Change-Id: Ib91c54c60c70ddbe09996713a976aa9485904f24
* Merge Chromium at r65505: Fix conflicts.Ben Murdoch2010-11-193-147/+3
| | | | | | | | | | | | | | | | | | | | | | | build/build_config.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=63506 chrome/browser/autofill/personal_data_manager.h chrome/browser/autofill/personal_data_manager.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=65100 chrome/common/extensions/docs/permission_warnings.html: Git got confused :/ net/base/host_resolver_impl.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=64369 base/logging.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=65062 base/message_loop.cc: http://src.chromium.org/viewvc/chrome?view=rev&revision=64975 Change-Id: Ied0356824b26ad7e6fea14fdc56cebb73b8b2f2a
* Merge Chromium at r65505: Initial merge by git.Ben Murdoch2010-11-181696-23275/+70234
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Merge Chromium at r63472 : Fix pref_value_store.ccIain Merrick2010-11-031-0/+2
| | | | | | | | | | | HasPolicyConflictingUserProxySettings method added. I think this do-nothing implementation is correct because we don't have any real pref stores. (Removing this method completely would be a bigger diff as it's called from a few different places.) http://src.chromium.org/viewvc/chrome?view=rev&revision=62716 Change-Id: I345522467a7a880abf698450de14b2c04522ae75
* Merge Chromium at r63472 : Fix personal_data_manager.ccIain Merrick2010-11-031-0/+4
| | | | | | | Some additional uses of AutoLock, not implemented on Android. http://src.chromium.org/viewvc/chrome?view=rev&revision=62049 Change-Id: I8f7a302a22dfabcbfb234fb0cc1af413a1dc1030
* Merge Chromium at r63472 : Fix conflicts.Iain Merrick2010-11-035-73/+10
| | | | | | | | | | | | | | | | | | | | | | SharedMemory added to stats_table.cc, duplicating Android change. http://src.chromium.org/viewvc/chrome?view=rev&revision=62510 chrome/browser/guid.h added to chrome/browser/autofill: http://src.chromium.org/viewvc/chrome?view=rev&revision=63173 chrome_thread.h renamed to browser_thread.h: http://src.chromium.org/viewvc/chrome?view=rev&revision=62286 DnsRRResolverWorker substantially overhauled: http://src.chromium.org/viewvc/chrome?view=rev&revision=61071 X509 certificates added for OpenSSL (replacing old Android hacks): http://src.chromium.org/viewvc/chrome?view=rev&revision=61955 OpenSSL now available in Chrome (previously enabled for Android only): http://src.chromium.org/viewvc/chrome?view=rev&revision=60936 Change-Id: I42e4fefcdabd996cb3c173dc412318b8c5ee20e2
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-032371-33786/+73693
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Implement l10n_util functions needed for AutoFill previews.Ben Murdoch2010-10-292-12/+0
| | | | | | | | | Generating an autofill preview uses localisation strings to work out how the preview should be formatted appropriate for the current users locale. On Android, call through JNI and look up the relevant string from the resources file. Change-Id: I74158278757d88cfeab407c13e69e6f4cf138630
* Final fixing of ANDROID guardsKristian Monsen2010-10-2710-578/+7
| | | | | | Verified that we now are in sync with chromium revision 61029 Change-Id: I49834ac6c0c422ab0d9a82caa02bdc63f456eadd
* Adding missing files to chrome/commonKristian Monsen2010-10-27652-0/+141953
| | | | | | Again, not used but added to make merges easier Change-Id: If11539b063fdf39e8ca7e82d5c7b642d512e8f12
* Adding missing files to chrome/browserKristian Monsen2010-10-27629-0/+87989
| | | | | | These are not used, but added to easier sync with chromium Change-Id: I54e6f2f49677e29736fd502758a438b2e3d685d8
* Merge Chromium at 7.0.540.0 : Fix chrome/browser/prefsIain Merrick2010-10-196-1199/+51
| | | | | | | | | | | | | | | | These files were edited in Android but moved in Chromium, and git wasn't able to resolve all the changes. I've tried to replicate the original Android code and avoid dragging in any extra dependencies. In PrefService, all calls to PrefNotifier are stripped out. In PrefValueStore, all stores except the trivial DefaultPrefStore are stripped out. See http://src.chromium.org/viewvc/chrome?view=rev&revision=57434 Change-Id: I624498c9503e0bacf4ec9c0956af11ba89219139
generated by cgit v1.1 at 2025-05-07 15:04:29 +0000