summaryrefslogtreecommitdiffstats
path: root/webkit/database
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 23:34:28 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-13 23:34:28 +0000
commit96626f5fb69b75e96fc10f11a6b213af2ca603b6 (patch)
tree64dc255d8f9fa303a847f8470e79206e6b7e3d3b /webkit/database
parent06e29a9c6a9f6279fcaca61fe10d7d31021b8b6e (diff)
downloadchromium_src-96626f5fb69b75e96fc10f11a6b213af2ca603b6.zip
chromium_src-96626f5fb69b75e96fc10f11a6b213af2ca603b6.tar.gz
chromium_src-96626f5fb69b75e96fc10f11a6b213af2ca603b6.tar.bz2
FBTF: Further parts of r61237 that should be harmless to chrome_frame.
BUG=none TEST=compiles everywhere Review URL: http://codereview.chromium.org/3748004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/database')
-rw-r--r--webkit/database/database_tracker.cc33
-rw-r--r--webkit/database/database_tracker.h32
2 files changed, 40 insertions, 25 deletions
diff --git a/webkit/database/database_tracker.cc b/webkit/database/database_tracker.cc
index a23d9f1..46e9dc1 100644
--- a/webkit/database/database_tracker.cc
+++ b/webkit/database/database_tracker.cc
@@ -45,6 +45,39 @@ static const int kCurrentVersion = 2;
static const int kCompatibleVersion = 1;
static const char* kExtensionOriginIdentifierPrefix = "chrome-extension_";
+OriginInfo::OriginInfo(const OriginInfo& origin_info)
+ : origin_(origin_info.origin_),
+ total_size_(origin_info.total_size_),
+ quota_(origin_info.quota_),
+ database_info_(origin_info.database_info_) {}
+
+OriginInfo::~OriginInfo() {}
+
+void OriginInfo::GetAllDatabaseNames(std::vector<string16>* databases) const {
+ for (DatabaseInfoMap::const_iterator it = database_info_.begin();
+ it != database_info_.end(); it++) {
+ databases->push_back(it->first);
+ }
+}
+
+int64 OriginInfo::GetDatabaseSize(const string16& database_name) const {
+ DatabaseInfoMap::const_iterator it = database_info_.find(database_name);
+ if (it != database_info_.end())
+ return it->second.first;
+ return 0;
+}
+
+string16 OriginInfo::GetDatabaseDescription(
+ const string16& database_name) const {
+ DatabaseInfoMap::const_iterator it = database_info_.find(database_name);
+ if (it != database_info_.end())
+ return it->second.second;
+ return string16();
+}
+
+OriginInfo::OriginInfo(const string16& origin, int64 total_size, int64 quota)
+ : origin_(origin), total_size_(total_size), quota_(quota) {}
+
DatabaseTracker::DatabaseTracker(const FilePath& profile_path,
bool is_incognito)
: is_initialized_(false),
diff --git a/webkit/database/database_tracker.h b/webkit/database/database_tracker.h
index 4976a91..08a66b2 100644
--- a/webkit/database/database_tracker.h
+++ b/webkit/database/database_tracker.h
@@ -36,38 +36,20 @@ class QuotaTable;
// This class is used to store information about all databases in an origin.
class OriginInfo {
public:
- OriginInfo(const OriginInfo& origin_info)
- : origin_(origin_info.origin_),
- total_size_(origin_info.total_size_),
- quota_(origin_info.quota_),
- database_info_(origin_info.database_info_) {}
+ OriginInfo(const OriginInfo& origin_info);
+ ~OriginInfo();
+
const string16& GetOrigin() const { return origin_; }
int64 TotalSize() const { return total_size_; }
int64 Quota() const { return quota_; }
- void GetAllDatabaseNames(std::vector<string16>* databases) const {
- for (DatabaseInfoMap::const_iterator it = database_info_.begin();
- it != database_info_.end(); it++) {
- databases->push_back(it->first);
- }
- }
- int64 GetDatabaseSize(const string16& database_name) const {
- DatabaseInfoMap::const_iterator it = database_info_.find(database_name);
- if (it != database_info_.end())
- return it->second.first;
- return 0;
- }
- string16 GetDatabaseDescription(const string16& database_name) const {
- DatabaseInfoMap::const_iterator it = database_info_.find(database_name);
- if (it != database_info_.end())
- return it->second.second;
- return string16();
- }
+ void GetAllDatabaseNames(std::vector<string16>* databases) const;
+ int64 GetDatabaseSize(const string16& database_name) const;
+ string16 GetDatabaseDescription(const string16& database_name) const;
protected:
typedef std::map<string16, std::pair<int64, string16> > DatabaseInfoMap;
- OriginInfo(const string16& origin, int64 total_size, int64 quota)
- : origin_(origin), total_size_(total_size), quota_(quota) { }
+ OriginInfo(const string16& origin, int64 total_size, int64 quota);
string16 origin_;
int64 total_size_;