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 8c8330fb312767f8f05e274b981690f8623784f4..eb5c6cfcda1a95cafeda50be99f90ef40423aa2c 100644 |
--- a/chrome/browser/browsing_data/cookies_tree_model.h |
+++ b/chrome/browser/browsing_data/cookies_tree_model.h |
@@ -135,7 +135,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> { |
}; |
CookieTreeNode() {} |
- explicit CookieTreeNode(const string16& title) |
+ explicit CookieTreeNode(const base::string16& title) |
: ui::TreeNode<CookieTreeNode>(title) {} |
virtual ~CookieTreeNode() {} |
@@ -180,7 +180,7 @@ class CookieTreeRootNode : public CookieTreeNode { |
class CookieTreeHostNode : public CookieTreeNode { |
public: |
// Returns the host node's title to use for a given URL. |
- static string16 TitleForUrl(const GURL& url); |
+ static base::string16 TitleForUrl(const GURL& url); |
explicit CookieTreeHostNode(const GURL& url); |
virtual ~CookieTreeHostNode(); |
@@ -635,7 +635,7 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> { |
void DeleteCookieNode(CookieTreeNode* cookie_node); |
// Filter the origins to only display matched results. |
- void UpdateSearchResults(const string16& filter); |
+ void UpdateSearchResults(const base::string16& filter); |
// Returns the set of extensions which protect the data item represented by |
// this node from deletion. |
@@ -681,35 +681,35 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> { |
void PopulateAppCacheInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateCookieInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateDatabaseInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateLocalStorageInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateSessionStorageInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateIndexedDBInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateFileSystemInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateQuotaInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateServerBoundCertInfoWithFilter( |
LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
void PopulateFlashLSOInfoWithFilter(LocalDataContainer* container, |
ScopedBatchUpdateNotifier* notifier, |
- const string16& filter); |
+ const base::string16& filter); |
// Map of app ids to LocalDataContainer objects to use when retrieving |
// locally stored data. |