diff options
| author | Iain Merrick <husky@google.com> | 2010-10-05 16:38:29 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:55 +0100 |
| commit | bc7e0823f37810f402bf7f115ee7ccd673f5ac34 (patch) | |
| tree | 6a41ff955d13aba0bcc56b9ce429ab05d566501e /app | |
| parent | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (diff) | |
| download | external_chromium-bc7e0823f37810f402bf7f115ee7ccd673f5ac34.zip external_chromium-bc7e0823f37810f402bf7f115ee7ccd673f5ac34.tar.gz external_chromium-bc7e0823f37810f402bf7f115ee7ccd673f5ac34.tar.bz2 | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/sql/connection.cc | 6 | ||||
| -rw-r--r-- | app/sql/statement.cc | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/app/sql/connection.cc b/app/sql/connection.cc index 1e0aa2c..32590d3 100644 --- a/app/sql/connection.cc +++ b/app/sql/connection.cc @@ -11,14 +11,11 @@ #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -<<<<<<< HEAD #ifdef ANDROID #include "sqlite3.h" #else -#include "third_party/sqlite/preprocessed/sqlite3.h" -#endif -======= #include "third_party/sqlite/sqlite3.h" +#endif namespace { @@ -47,7 +44,6 @@ class ScopedBusyTimeout { }; } // namespace ->>>>>>> Chromium at release 7.0.540.0 namespace sql { diff --git a/app/sql/statement.cc b/app/sql/statement.cc index 3cff490..93553bb 100644 --- a/app/sql/statement.cc +++ b/app/sql/statement.cc @@ -6,15 +6,11 @@ #include "base/logging.h" #include "base/utf_string_conversions.h" -<<<<<<< HEAD #ifdef ANDROID #include "sqlite3.h" #else -#include "third_party/sqlite/preprocessed/sqlite3.h" -#endif -======= #include "third_party/sqlite/sqlite3.h" ->>>>>>> Chromium at release 7.0.540.0 +#endif namespace sql { |