Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(500)

Unified Diff: content/common/indexed_db/indexed_db_key.h

Issue 19442002: Convert to new WebIDBTypes enums and accessors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix content/common/DEPS Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/DEPS ('k') | content/common/indexed_db/indexed_db_key.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/indexed_db/indexed_db_key.h
diff --git a/content/common/indexed_db/indexed_db_key.h b/content/common/indexed_db/indexed_db_key.h
index e688939e621f1b76c8215f214316ca2888727133..9b46ed7d6f9cb93d34c74e252037f06fd3b541b9 100644
--- a/content/common/indexed_db/indexed_db_key.h
+++ b/content/common/indexed_db/indexed_db_key.h
@@ -11,7 +11,11 @@
#include "base/memory/scoped_vector.h"
#include "base/strings/string16.h"
#include "content/common/content_export.h"
-#include "third_party/WebKit/public/platform/WebIDBKey.h"
+#include "third_party/WebKit/public/platform/WebIDBTypes.h"
+
+namespace WebKit {
+class WebIDBKey;
+}
namespace content {
@@ -19,12 +23,12 @@ class CONTENT_EXPORT IndexedDBKey {
public:
typedef std::vector<IndexedDBKey> KeyArray;
- IndexedDBKey(); // Defaults to WebKit::WebIDBKey::InvalidType.
- IndexedDBKey(WebKit::WebIDBKey::Type); // must be Null or Invalid
+ IndexedDBKey(); // Defaults to WebKit::WebIDBKeyTypeInvalid.
+ IndexedDBKey(WebKit::WebIDBKeyType); // must be Null or Invalid
explicit IndexedDBKey(const KeyArray& array);
explicit IndexedDBKey(const string16& str);
IndexedDBKey(double number,
- WebKit::WebIDBKey::Type type); // must be date or number
+ WebKit::WebIDBKeyType type); // must be date or number
explicit IndexedDBKey(const WebKit::WebIDBKey& key);
~IndexedDBKey();
@@ -34,7 +38,7 @@ class CONTENT_EXPORT IndexedDBKey {
bool IsLessThan(const IndexedDBKey& other) const;
bool IsEqual(const IndexedDBKey& other) const;
- WebKit::WebIDBKey::Type type() const { return type_; }
+ WebKit::WebIDBKeyType type() const { return type_; }
const std::vector<IndexedDBKey>& array() const { return array_; }
const string16& string() const { return string_; }
double date() const { return date_; }
@@ -44,7 +48,7 @@ class CONTENT_EXPORT IndexedDBKey {
size_t size_estimate() const { return size_estimate_; }
private:
- WebKit::WebIDBKey::Type type_;
+ WebKit::WebIDBKeyType type_;
std::vector<IndexedDBKey> array_;
string16 string_;
double date_;
« no previous file with comments | « content/common/DEPS ('k') | content/common/indexed_db/indexed_db_key.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698