diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/content/browser/dom_storage/dom_storage_namespace.cc | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/browser/dom_storage/dom_storage_namespace.cc')
| -rw-r--r-- | chromium/content/browser/dom_storage/dom_storage_namespace.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chromium/content/browser/dom_storage/dom_storage_namespace.cc b/chromium/content/browser/dom_storage/dom_storage_namespace.cc index f554ac58814..25e44e53e3f 100644 --- a/chromium/content/browser/dom_storage/dom_storage_namespace.cc +++ b/chromium/content/browser/dom_storage/dom_storage_namespace.cc @@ -4,7 +4,6 @@ #include "content/browser/dom_storage/dom_storage_namespace.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/location.h" #include "base/logging.h" @@ -24,7 +23,7 @@ DOMStorageNamespace::DOMStorageNamespace( } DOMStorageNamespace::DOMStorageNamespace( - int64 namespace_id, + int64_t namespace_id, const std::string& persistent_namespace_id, SessionStorageDatabase* session_storage_database, DOMStorageTaskRunner* task_runner) @@ -72,7 +71,7 @@ DOMStorageArea* DOMStorageNamespace::GetOpenStorageArea(const GURL& origin) { } DOMStorageNamespace* DOMStorageNamespace::Clone( - int64 clone_namespace_id, + int64_t clone_namespace_id, const std::string& clone_persistent_namespace_id) { DCHECK_NE(kLocalStorageNamespaceId, namespace_id_); DCHECK_NE(kLocalStorageNamespaceId, clone_namespace_id); |