summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at r12.0.742.93: Initial merge by gitKristian Monsen2011-07-087-42/+124
| | | | Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
* Define USE_SYSTEM_SQLITE and remove local changeKristian Monsen2011-07-081-9/+0
| | | | | | | Android is already using the system sqlite, but the define was not available at the time of the initial port. Change-Id: I41b740a82e39cdbdea2639478a606febd9e105eb
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-143-9/+13
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-031-1/+1
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Merge Chromium at 7.0.540.0 : Resolve conflicts.Iain Merrick2010-10-192-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1913-24/+131
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Collection of all the changs to external chromium.Ben Murdoch2010-08-112-0/+17
| | | | | | | | Time is running out, I guess we have to submit this and remember to upstream. Rebased to chromium r53293 Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
* Merge Chromium src@r53293Ben Murdoch2010-08-0414-0/+1943
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34