summaryrefslogtreecommitdiffstats
path: root/chrome/browser
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-032102-30705/+65585
| | | | 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/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
* Merge Chromium at 7.0.540.0 : Resolve conflicts.Iain Merrick2010-10-197-86/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-193242-79419/+93767
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Ensure ChromeThread is not referenced at all in Android builds.Iain Merrick2010-10-041-3/+7
| | | | | | | | This was causing a link error in debug builds. It worked in release builds because the unguarded call to ChromeThread was being optimized away. Change-Id: I82f34abfffb5e1da9c0f89b644b8879906f2c3ab
* Refactor URLFetcherProxy to minimise the Android-specific diffSteve Block2010-09-272-36/+0
| | | | | | | 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-1317-6/+318
| | | | | | | | | | | | | 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
* Collection of all the changs to external chromium.Ben Murdoch2010-08-111-0/+62
| | | | | | | | 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-043952-0/+790759
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
generated by cgit v1.1 at 2025-02-04 11:47:58 +0000