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

Unified Diff: chrome/browser/browsing_data/cookies_tree_model.h

Issue 428323002: ifdef remaining extensions code in chrome/browser/browsing_data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang again Created 6 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
Index: chrome/browser/browsing_data/cookies_tree_model.h
diff --git a/chrome/browser/browsing_data/cookies_tree_model.h b/chrome/browser/browsing_data/cookies_tree_model.h
index 00dcd11ce71d20e545409b9356e254561b8b5bda..5493828c33e534cc84ea6106d33fd3aac79dcf47 100644
--- a/chrome/browser/browsing_data/cookies_tree_model.h
+++ b/chrome/browser/browsing_data/cookies_tree_model.h
@@ -428,7 +428,6 @@ class CookieTreeLocalStoragesNode : public CookieTreeNode {
}
private:
-
DISALLOW_COPY_AND_ASSIGN(CookieTreeLocalStoragesNode);
};
@@ -468,7 +467,6 @@ class CookieTreeSessionStoragesNode : public CookieTreeNode {
}
private:
-
DISALLOW_COPY_AND_ASSIGN(CookieTreeSessionStoragesNode);
};
@@ -640,12 +638,14 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {
// Filter the origins to only display matched results.
void UpdateSearchResults(const base::string16& filter);
+#if defined(ENABLE_EXTENSIONS)
// Returns the set of extensions which protect the data item represented by
// this node from deletion.
// Returns NULL if the node doesn't represent a protected data item or the
// special storage policy is NULL.
const extensions::ExtensionSet* ExtensionsProtectingNode(
const CookieTreeNode& cookie_node);
+#endif
// Manages CookiesTreeModel::Observers. This will also call
// TreeNodeModel::AddObserver so that it gets all the proper notifications.
@@ -718,8 +718,10 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {
// locally stored data.
scoped_ptr<LocalDataContainer> data_container_;
+#if defined(ENABLE_EXTENSIONS)
// The extension special storage policy; see ExtensionsProtectingNode() above.
scoped_refptr<ExtensionSpecialStoragePolicy> special_storage_policy_;
+#endif
// The CookiesTreeModel maintains a separate list of observers that are
// specifically of the type CookiesTreeModel::Observer.
« no previous file with comments | « chrome/browser/browsing_data/browsing_data_remover.cc ('k') | chrome/browser/browsing_data/cookies_tree_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698