summaryrefslogtreecommitdiffstats
path: root/chrome/common
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at 12.0.742.130: Initial merge by gitKristian Monsen2011-07-265-52/+353
| | | | | | Fix for bug 5080607 Update external/chromium to latest revision Change-Id: I5c98b0d2845fccca4cbcdcea506e8f1759ba5416
* Merge Chromium at r12.0.742.93: Compile fixes, add virtual destructorsKristian Monsen2011-07-081-0/+3
| | | | | | | 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: Initial merge by gitKristian Monsen2011-07-08417-25867/+17403
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Merge Chromium at r11.0.696.0: Initial merge by gitKristian Monsen2011-06-29335-9692/+7914
| | | | Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-14295-4740/+24780
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-25145-463/+1124
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at 10.0.621.0: Initial merge by git.Kristian Monsen2011-05-16247-7546/+9931
| | | | Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
* Merge Chromium at 9.0.597.106Steve Block2011-02-182-33/+109
| | | | | | This is branches/597 at r74919. Change-Id: Iab4795189c52e254b04051b05cbceda407afb0b6
* Merge Chromium at 9.0.597.83: Trivial merge by GitBen Murdoch2011-01-2517-32/+8
| | | | 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-1687-1093/+535
| | | | | | /branches/597/src@71538 Change-Id: Id9fad65a5e6d2ab901d9c8bff6dbf96ab7977f36
* Merge chromium at 9.0.597.55: Initial merge by git.Ben Murdoch2011-01-11150-1670/+5019
| | | | Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
* Fix crash in AutoFillBen Murdoch2010-12-202-0/+10
| | | | | | | | | | | | | | | | 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
* 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: Initial merge by git.Ben Murdoch2010-12-03216-2898/+10074
| | | | Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
* Merge Chromium at r65505: Fix conflicts.Ben Murdoch2010-11-191-7/+0
| | | | | | | | | | | | | | | | | | | | | | | 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-18215-1853/+5689
| | | | Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-03270-3081/+8108
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Adding missing files to chrome/commonKristian Monsen2010-10-27652-0/+141953
| | | | | | Again, not used but added to make merges easier Change-Id: If11539b063fdf39e8ca7e82d5c7b642d512e8f12
* Merge Chromium at 7.0.540.0 : Resolve conflicts.Iain Merrick2010-10-191-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection.cc, statement.cc: SQL headers moved one level deeper. http://src.chromium.org/viewvc/chrome?view=rev&revision=56619 base_paths_posix.cc: EnvVarGetter renamed to Environment. http://src.chromium.org/viewvc/chrome?view=rev&revision=55326 logging.cc: VLOG added, skipping in Android to minimize bloat. http://src.chromium.org/viewvc/chrome?view=rev&revision=60976 process_util, spellcheck_host_observer, url_fetcher: Virtual destructors added (duplicating existing Android change). http://src.chromium.org/viewvc/chrome?view=rev&revision=62339 autofill_host.h: this is an Android-only file, but it depends on AutoFillSuggestionsReturn in render_view_host.h. Icons added in http://src.chromium.org/viewvc/chrome?view=rev&revision=54052 autofill_manager, personal_data_manager: InfoBarDelegate added. http://src.chromium.org/viewvc/chrome?view=rev&revision=51908 credit_card.cc: #include <string> added for card type detection. http://src.chromium.org/viewvc/chrome?view=rev&revision=54280 web_data_service.h: #includes reorganised to reduce build time. http://src.chromium.org/viewvc/chrome?view=rev&revision=58080 host_resolver_impl.cc: parameter added to constructor. http://src.chromium.org/viewvc/chrome?view=rev&revision=57189 host_resolver_proc.cc: retry logic updated. http://src.chromium.org/viewvc/chrome?view=rev&revision=58534 http_network_transaction.cc: stream initialization refactored. http://src.chromium.org/viewvc/chrome?view=rev&revision=57342 net_resources.target.mk: generated from net.gyp, using latest version. proxy_service.cc: ProxyConfigService for Chrome, clashes with Android. http://src.chromium.org/viewvc/chrome?view=rev&revision=57204 Change-Id: I0e05226051d67492692bdb1a5430b2f15ce72aa0
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-19248-5803/+10865
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Refactor URLFetcherProxy to minimise the Android-specific diffSteve Block2010-09-272-4/+27
| | | | | | | URLFetcherProxy now extends URLFetcher to minimise the diff in code that uses this class. Change-Id: Id5abdfb82f334cf36f01f178ac300d64f0017e9f
* Intial set of changes to enable autofill on Android.Ben Murdoch2010-09-131-0/+8
| | | | | | | | | | | | | This is the initial checkin of AutoFill code into external/chromium. There's still lots to do, but this basically gets autofill working end to end, using a precanned profile injected from WebCore. By default, autofill is not enabled at the moment. For testing you can turn it on by setting the ENABLE_AUTOFILL environment variable to "true" and rebuilding. There is a corresponding change in external/webkit. Change-Id: I74ef1ccc3fd0625f1bb8e2f85b43a60d23c59ffc
* Add chrome/common @ 52593Ben Murdoch2010-08-18277-0/+39486
Needed by autofill Change-Id: Ibfea9ab92382af0bd0cfc6e94d21e4baa4b9d896
generated by cgit v1.1 at 2024-12-22 13:04:34 +0000