diff options
| author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 20:48:27 +0000 |
|---|---|---|
| committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-20 20:48:27 +0000 |
| commit | c0b7a009c3a3c91d9fc397b71f7a4c562a8fa585 (patch) | |
| tree | c2618dbe0901eccd58489edf60fa496ac1d1133f /chrome/browser/browsing_data/cookies_tree_model.cc | |
| parent | 71d7191826378b589f590746dd03093a7ffa2e9d (diff) | |
| download | chromium_src-c0b7a009c3a3c91d9fc397b71f7a4c562a8fa585.zip chromium_src-c0b7a009c3a3c91d9fc397b71f7a4c562a8fa585.tar.gz chromium_src-c0b7a009c3a3c91d9fc397b71f7a4c562a8fa585.tar.bz2 | |
Port BrowsingDataDatabaseHelper to webkit_database::DatabaseIdentifier
This avoids a hop over to the webkit thread to construct an origin identifier and
a dependency on third_party/WebKit for WebSecurityOrigin.
R=michaeln
BUG=237267
Review URL: https://chromiumcodereview.appspot.com/17003010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@207555 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data/cookies_tree_model.cc')
| -rw-r--r-- | chrome/browser/browsing_data/cookies_tree_model.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index dcb4b25..58abc27 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -189,7 +189,7 @@ CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitDatabase( const BrowsingDataDatabaseHelper::DatabaseInfo* database_info) { Init(TYPE_DATABASE); this->database_info = database_info; - origin = GURL(database_info->origin); + origin = database_info->identifier.ToOrigin(); return *this; } @@ -342,7 +342,7 @@ void CookieTreeDatabaseNode::DeleteStoredObjects() { if (container) { container->database_helper_->DeleteDatabase( - database_info_->origin_identifier, database_info_->database_name); + database_info_->identifier.ToString(), database_info_->database_name); container->database_info_list_.erase(database_info_); } } @@ -1113,7 +1113,7 @@ void CookiesTreeModel::PopulateDatabaseInfoWithFilter( container->database_info_list_.begin(); database_info != container->database_info_list_.end(); ++database_info) { - GURL origin(database_info->origin); + GURL origin(database_info->identifier.ToOrigin()); if (!filter.size() || (CookieTreeHostNode::TitleForUrl(origin).find(filter) != |