| 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/net/base/dnsrr_resolver.cc
|
| 5bc0d8d0128a8fb64b9b0edfe64b61fa6549baab |
|
01-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Compile fix in dnsrr_resolver.cc
A lot of functionality was introduced to the WINDOWS version,
which we were using.
Creating a new Android path that matches the old Windows
and Android path.
CL:
http://codereview.chromium.org/6180001
Change-Id: Icc88f69ea092adc1f0f5fa7166bb669499096259
/external/chromium/net/base/dnsrr_resolver.cc
|
| 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/net/base/dnsrr_resolver.cc
|
| 3f50c38dc070f4bb515c1b64450dae14f316474e |
|
24-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r10.0.634.0: Initial merge by git.
Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
/external/chromium/net/base/dnsrr_resolver.cc
|
| 21d179b334e59e9a3bfcaed4c4430bef1bc5759d |
|
11-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
/external/chromium/net/base/dnsrr_resolver.cc
|
| 2255f234e3edbf06b52de2ab4329d1564ef8efb0 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Fix conflicts.
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
/external/chromium/net/base/dnsrr_resolver.cc
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/net/base/dnsrr_resolver.cc
|
| dd0e069b1c2e5079f99024c4d54c7d06ef81d11b |
|
13-Oct-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at 7.0.540.0 : Fix networking code.
Linux-specific code in dnsrr_resolver.cc doesn't compile on Android.
http://src.chromium.org/viewvc/chrome?view=rev&revision=54907
NetLog added to HostResolver, fixing Android-specific code.
http://src.chromium.org/viewvc/chrome?view=rev&revision=57189
Linux-specific IPv6 code in net_util.cc doesn't compile on Android.
http://src.chromium.org/viewvc/chrome?view=rev&revision=41743
Not including SSL false start blacklist on Android to reduce bloat.
http://src.chromium.org/viewvc/chrome?view=rev&revision=58824
ProxyConfigServiceNull is still used on unsupported platforms.
This is a bug in Chromium. Reverting its deletion.
http://src.chromium.org/viewvc/chrome?view=rev&revision=59362
Added virtual destructor to DNSSECPRovider in ssl_client_socket.h
This has already been done for other Chrome classes, should be easy
to upstream.
Change-Id: I158fc709c295712dc35c4172708a294f65a381a4
/external/chromium/net/base/dnsrr_resolver.cc
|
| 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/net/base/dnsrr_resolver.cc
|