| 4830184c9a6d4b40d7f887b921aefa25bf4d3ad3 |
|
05-Jul-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Fix conflicts in web_data_service.h
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
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| ddb351dbec246cf1fab5ec20d2d5520909041de1 |
|
28-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r12.0.742.93: Initial merge by git
Change-Id: Ic5ee2fec31358bbee305f7e915442377bfa6cda6
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| df8681736ba20032c392b1e112a93ac7e5fe0335 |
|
21-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Compile fix in web_data_service.h
Adding includes that are no longer indirectly included on Android
Change-Id: Ib52b786310342220e975fe868c8e5e862886d24d
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| e5757d9f5d659078c7e68329c5cd2c4b39c38668 |
|
16-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Fix conflict in web_data_service.h
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
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| dc0f95d653279beabeb9817299e2902918ba123e |
|
09-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| 72a454cd3513ac24fbdd0e0cb9ad70b86a99b801 |
|
31-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium.org at r11.0.672.0: Initial merge by git.
Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| 513209b27ff55e2841eac0e4120199c23acce758 |
|
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| 1391b24619d56bae6ce14bb54ed0fb16a945e853 |
|
27-Oct-2010 |
Kristian Monsen <kristianm@google.com> |
Final fixing of ANDROID guards
Verified that we now are in sync with chromium revision 61029
Change-Id: I49834ac6c0c422ab0d9a82caa02bdc63f456eadd
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| bc7e0823f37810f402bf7f115ee7ccd673f5ac34 |
|
05-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Resolve conflicts.
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
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| 3345a6884c488ff3a535c2c9acdd33d74b37e311 |
|
19-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| 7d214dfa174224b459660971e5b5cce2e06be02a |
|
06-Aug-2010 |
Ben Murdoch <benm@google.com> |
Intial set of changes to enable autofill on Android.
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
/external/chromium/chrome/browser/webdata/web_data_service.h
|
| c407dc5cd9bdc5668497f21b26b09d988ab439de |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
/external/chromium/chrome/browser/webdata/web_data_service.h
|