| 4154342345fc67972570f59528233826cd397f1e |
|
18-Oct-2011 |
Kristian Monsen <kristianm@google.com> |
Part of fix for bug 5455901 Export symbols from base
Some are upstream, others guarded with #ifdef ANDROID are not
Change-Id: I8615feafc0ad088d237794acdace655d9f842c12
/external/chromium/base/logging.cc
|
| 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/base/logging.cc
|
| 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/base/logging.cc
|
| 10a271fde41d76b98e66b4394f9bee383be5a1da |
|
01-Jun-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at r11.0.672.0: Fix conflicts in logging.cc
This CL was close to our local edit:
http://src.chromium.org/viewvc/chrome/trunk/src/base/logging.cc?view=diff&pathrev=74924&r1=70976&r2=70977
Change-Id: I9b689dfe5cd85dc069923207aaf222a33109120b
/external/chromium/base/logging.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/base/logging.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/base/logging.cc
|
| 1958f25718c34665d6f3fc3dcd18db91ba52ec33 |
|
17-May-2011 |
Kristian Monsen <kristianm@google.com> |
Removing local changes that strip out vlog
Slightly less #ifdef's
Change-Id: Icd55c23e1e8ffb4b7f3b8740617b96f257160aab
/external/chromium/base/logging.cc
|
| 3f0cfa6dac09f045cff31c0366b0f3332657715a |
|
11-May-2011 |
Kristian Monsen <kristianm@google.com> |
Merge Chromium at 10.0.621.0: Fix conflict in logging.cc
Changes at the same place as our local edit:
http://codereview.chromium.org/5804004
Change-Id: I176dbe5bff0f652088f74f5a92ffe22d789b74f9
/external/chromium/base/logging.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/base/logging.cc
|
| 201ade2fbba22bfb27ae029f4d23fca6ded109a0 |
|
07-Jan-2011 |
Ben Murdoch <benm@google.com> |
Merge chromium at 9.0.597.55: Initial merge by git.
Change-Id: Id686a88437441ec7e17abb3328a404c7b6c3c6ad
/external/chromium/base/logging.cc
|
| 4a5e2dc747d50c653511c68ccb2cfbfb740bd5a7 |
|
25-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r66597: Initial merge by git.
Change-Id: I9639f8a997f90ec219573aa22a49f5dbde78cc7b
/external/chromium/base/logging.cc
|
| d5335d37310036a1236ba3f4195afbdc55a85b5a |
|
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Fix conflicts.
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
/external/chromium/base/logging.cc
|
| 513209b27ff55e2841eac0e4120199c23acce758 |
|
18-Nov-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
/external/chromium/base/logging.cc
|
| 731df977c0511bca2206b5f333555b1205ff1f43 |
|
01-Nov-2010 |
Iain Merrick <husky@google.com> |
Merge Chromium at r63472 : Initial merge by git.
Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
/external/chromium/base/logging.cc
|
| 58d02015f8788a79b322c58d4bdbc914e4c333dc |
|
22-Oct-2010 |
Kristian Monsen <kristianm@google.com> |
Syncing external/chroimum with chromium release 61029, base part 2
Removing old hacks that can be removed.
file_util_linux.cc was out of sync, there were no local changes so
just took the chromium version
Bug: 3123385
Change-Id: Ia73d28cdad39158e4703aaa991764189e9e13439
/external/chromium/base/logging.cc
|
| 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/base/logging.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/base/logging.cc
|
| 00d26a728db2814620f390b418a7d6325ce5aca6 |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Collection of all the changs to external chromium.
Time is running out, I guess we have to submit this and remember to upstream.
Rebased to chromium r53293
Change-Id: Ie61ca0433b1eedd90144aee87c5efcd68fdc37ac
/external/chromium/base/logging.cc
|
| c407dc5cd9bdc5668497f21b26b09d988ab439de |
|
29-Jul-2010 |
Ben Murdoch <benm@google.com> |
Merge Chromium src@r53293
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34
/external/chromium/base/logging.cc
|
| c7f5f8508d98d5952d42ed7648c2a8f30a4da156 |
|
04-Feb-2010 |
Patrick Scott <phanna@android.com> |
Initial source checkin.
The source files were determined by building net_unittests in chromium's source
tree. Some of the obvious libraries were left out (v8, gmock, gtest).
The Android.mk file has all the sources (minus unittests and tools) that were
used during net_unittests compilation. Nothing builds yet because of STL but
that is the next task. The .cpp files will most likely not compile anyways
because of the LOCAL_CPP_EXTENSION mod. I will have to break this into multiple
projects to get around that limitation.
/external/chromium/base/logging.cc
|