chrome/browser/cookies_tree_model.h - Issue 10536017: Refactoring CookiesTreeModel to support multiple data sources.

Unified Diff: chrome/browser/cookies_tree_model.h

Issue 10536017: Refactoring CookiesTreeModel to support multiple data sources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixes for commes by James and Evan. Created 8 years, 6 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

Index: chrome/browser/cookies_tree_model.h

diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h

index e99fa7f5188930d2aab740e58e49744c74e18ac8..ed6309db2399fb55da541c9d28d5f5b6ecba6423 100644

--- a/chrome/browser/cookies_tree_model.h

+++ b/chrome/browser/cookies_tree_model.h

@@ -24,6 +24,7 @@

#include "chrome/browser/browsing_data_indexed_db_helper.h"

#include "chrome/browser/browsing_data_local_storage_helper.h"

#include "chrome/browser/browsing_data_quota_helper.h"

+#include "chrome/browser/local_data_container.h"

#include "chrome/common/content_settings.h"

#include "net/base/server_bound_cert_store.h"

#include "net/cookies/cookie_monster.h"

@@ -39,18 +40,19 @@ class CookieTreeCookieNode;

class CookieTreeCookiesNode;

class CookieTreeDatabaseNode;

class CookieTreeDatabasesNode;

-class CookieTreeFileSystemsNode;

class CookieTreeFileSystemNode;

+class CookieTreeFileSystemsNode;

+class CookieTreeIndexedDBNode;

+class CookieTreeIndexedDBsNode;

class CookieTreeLocalStorageNode;

class CookieTreeLocalStoragesNode;

+class CookieTreeOriginNode;

+class CookieTreeQuotaNode;

class CookieTreeServerBoundCertNode;

class CookieTreeServerBoundCertsNode;

-class CookieTreeQuotaNode;

class CookieTreeSessionStorageNode;

class CookieTreeSessionStoragesNode;

-class CookieTreeIndexedDBNode;

-class CookieTreeIndexedDBsNode;

-class CookieTreeOriginNode;

// CookieTreeNode -------------------------------------------------------------

// The base node type in the Cookies, Databases, and Local Storage options

@@ -66,6 +68,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {

enum NodeType {

TYPE_NONE,

TYPE_ROOT, // This is used for CookieTreeRootNode nodes.

+ TYPE_APP, // This is used for CookieTreeAppNode nodes.

TYPE_ORIGIN, // This is used for CookieTreeOriginNode nodes.

TYPE_COOKIES, // This is used for CookieTreeCookiesNode nodes.

TYPE_COOKIE, // This is used for CookieTreeCookieNode nodes.

@@ -107,6 +110,14 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {

return *this;

}

+ DetailedInfo& InitApp(const std::string& app_name,

+ const std::string& app_id) {

+ Init(TYPE_APP);

+ this->app_name = app_name;

+ this->app_id = app_id;

+ return *this;

+ }

DetailedInfo& InitCookie(

const net::CookieMonster::CanonicalCookie* cookie) {

Init(TYPE_COOKIE);

@@ -171,6 +182,8 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {

return *this;

}

+ std::string app_name;

+ std::string app_id;

string16 origin;

NodeType node_type;

const net::CookieMonster::CanonicalCookie* cookie;

@@ -202,11 +215,19 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {

virtual DetailedInfo GetDetailedInfo() const = 0;

protected:

+ // This class implements comparison by title of a CookieTreeNode. It is

+ // used to insert nodes in alphabetical order.

class NodeTitleComparator {

public:

bool operator() (const CookieTreeNode* lhs, const CookieTreeNode* rhs);

};

+ // This class implements comparison by application id of a CookieTreeAppNode.

+ class AppNodeComparator {

+ public:

+ bool operator() (const CookieTreeNode* lhs, const CookieTreeNode* rhs);

+ };

void AddChildSortedByTitle(CookieTreeNode* new_child);

private:

@@ -214,6 +235,27 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> {

DISALLOW_COPY_AND_ASSIGN(CookieTreeNode);

};

+// CookieTreeAppNode ----------------------------------------------------------

+class CookieTreeAppNode : public CookieTreeNode {

+ public:

+ explicit CookieTreeAppNode(const std::string& app_name,

+ const std::string& app_id);

+ virtual ~CookieTreeAppNode();

+ CookieTreeOriginNode* GetOrCreateOriginNode(const GURL& url);

+ // CookieTreeNode methods:

+ virtual DetailedInfo GetDetailedInfo() const OVERRIDE;

+ const std::string& app_id() const { return app_id_; }

+ private:

+ std::string app_name_;

+ std::string app_id_;

+ DISALLOW_COPY_AND_ASSIGN(CookieTreeAppNode);

+};

// CookieTreeRootNode ---------------------------------------------------------

// The node at the root of the CookieTree that gets inserted into the view.

class CookieTreeRootNode : public CookieTreeNode {

@@ -221,7 +263,10 @@ class CookieTreeRootNode : public CookieTreeNode {

explicit CookieTreeRootNode(CookiesTreeModel* model);

virtual ~CookieTreeRootNode();

- CookieTreeOriginNode* GetOrCreateOriginNode(const GURL& url);

+ // Creates a new CookieTreeAppNode, based on the app id and name. If a node,

+ // already exists in the tree, it returns a pointer to it.

+ CookieTreeAppNode* GetOrCreateAppNode(const std::string& app_name,

+ const std::string& app_id);

// CookieTreeNode methods:

virtual CookiesTreeModel* GetModel() const OVERRIDE;

@@ -237,7 +282,7 @@ class CookieTreeRootNode : public CookieTreeNode {

class CookieTreeOriginNode : public CookieTreeNode {

public:

// Returns the origin node's title to use for a given URL.

- static std::wstring TitleForUrl(const GURL& url);

+ static string16 TitleForUrl(const GURL& url);

explicit CookieTreeOriginNode(const GURL& url);

virtual ~CookieTreeOriginNode();

@@ -614,9 +659,41 @@ class CookieTreeServerBoundCertsNode : public CookieTreeNode {

DISALLOW_COPY_AND_ASSIGN(CookieTreeServerBoundCertsNode);

};

+// CookiesTreeModelDelegate ---------------------------------------------------

+// This is a delegate definition class. It is used by the CookiesTreeModel

+// to pass a pointer to itself to each of the LocalDataContainer objects, so

+// when resource fetching is complete, the objects can call back to the model

+// and update it. The CookiesTreeModel instance must outlive the

+// LocalDataContainer instances.

+class CookiesTreeModelDelegate {

+ public:

+ virtual void PopulateAppCacheInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateCookieInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateDatabaseInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateLocalStorageInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateSessionStorageInfoWithFilter(

+ const std::string* app_id, const string16& filter) = 0;

+ virtual void PopulateIndexedDBInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateFileSystemInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateQuotaInfoWithFilter(const std::string* app_id,

+ const string16& filter) = 0;

+ virtual void PopulateServerBoundCertInfoWithFilter(

+ const std::string* app_id, const string16& filter) = 0;

+};

// CookiesTreeModel -----------------------------------------------------------

-class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {

+class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode>,

+ public CookiesTreeModelDelegate {

public:

+ CookiesTreeModel(const ContainerMap& apps_map, bool use_cookie_source);

+ virtual ~CookiesTreeModel();

// Because non-cookie nodes are fetched in a background thread, they are not

// present at the time the Model is created. The Model then notifies its

// observers for every item added from databases, local storage, and

@@ -628,19 +705,6 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {

virtual void TreeModelEndBatch(CookiesTreeModel* model) {}

};

- CookiesTreeModel(

- BrowsingDataCookieHelper* cookie_helper,

- BrowsingDataDatabaseHelper* database_helper,

- BrowsingDataLocalStorageHelper* local_storage_helper,

- BrowsingDataLocalStorageHelper* session_storage_helper,

- BrowsingDataAppCacheHelper* appcache_helper,

- BrowsingDataIndexedDBHelper* indexed_db_helper,

- BrowsingDataFileSystemHelper* file_system_helper,

- BrowsingDataQuotaHelper* quota_helper,

- BrowsingDataServerBoundCertHelper* server_bound_cert_helper,

- bool use_cookie_source);

- virtual ~CookiesTreeModel();

// ui::TreeModel methods:

// Returns the set of icons for the nodes in the tree. You only need override

// this if you don't want to use the default folder icons.

@@ -653,10 +717,13 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {

// CookiesTreeModel methods:

void DeleteAllStoredObjects();

+ // Deletes all the stored objects for a specific app, identified by |app_id|.

+ void DeleteStoredObjectsForApp(const std::string& app_id);

void DeleteCookieNode(CookieTreeNode* cookie_node);

// Filter the origins to only display matched results.

- void UpdateSearchResults(const std::wstring& filter);

+ void UpdateSearchResults(const string16& filter);

// Manages CookiesTreeModel::Observers. This will also call

// TreeNodeModel::AddObserver so that it gets all the proper notifications.

@@ -665,99 +732,55 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {

virtual void AddCookiesTreeObserver(Observer* observer);

virtual void RemoveCookiesTreeObserver(Observer* observer);

+ // CookiesTreeModelDelegate methods:

+ virtual void PopulateAppCacheInfoWithFilter(