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

Unified Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2827523003: Move BrowsingDataRemover to content/ (Closed)
Patch Set: Addressed some comments. Created 3 years, 8 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/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 9679ace6f7191eb3b92cefed99db4e08c2ab3712..100b8f13e74daeee11375a554adf9c86ce2f9e0a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -35,8 +35,6 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_shutdown.h"
#include "chrome/browser/browsing_data/browsing_data_helper.h"
-#include "chrome/browser/browsing_data/browsing_data_remover.h"
-#include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
#include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.h"
#include "chrome/browser/budget_service/budget_service_impl.h"
#include "chrome/browser/chrome_content_browser_client_parts.h"
@@ -161,6 +159,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/browser_url_handler.h"
#include "content/public/browser/browsing_data_filter_builder.h"
+#include "content/public/browser/browsing_data_remover.h"
#include "content/public/browser/child_process_data.h"
#include "content/public/browser/child_process_security_policy.h"
#include "content/public/browser/client_certificate_delegate.h"
@@ -933,9 +932,9 @@ bool GetDataSaverEnabledPref(const PrefService* prefs) {
// A BrowsingDataRemover::Observer that waits for |count|
// OnBrowsingDataRemoverDone() callbacks, translates them into
// one base::Closure, and then destroys itself.
-class ClearSiteDataObserver : public BrowsingDataRemover::Observer {
+class ClearSiteDataObserver : public content::BrowsingDataRemover::Observer {
public:
- explicit ClearSiteDataObserver(BrowsingDataRemover* remover,
+ explicit ClearSiteDataObserver(content::BrowsingDataRemover* remover,
const base::Closure& callback,
int count)
: remover_(remover), callback_(callback), count_(count) {
@@ -955,7 +954,7 @@ class ClearSiteDataObserver : public BrowsingDataRemover::Observer {
}
private:
- BrowsingDataRemover* remover_;
+ content::BrowsingDataRemover* remover_;
base::Closure callback_;
int count_;
};
@@ -2575,6 +2574,12 @@ net::NetLog* ChromeContentBrowserClient::GetNetLog() {
return g_browser_process->net_log();
}
+bool ChromeContentBrowserClient::MayDeleteHistory(
+ content::BrowserContext* browser_context) {
+ const Profile* profile = Profile::FromBrowserContext(browser_context);
+ return profile->GetPrefs()->GetBoolean(prefs::kAllowDeletingBrowserHistory);
+}
+
void ChromeContentBrowserClient::OverrideWebkitPrefs(
RenderViewHost* rvh, WebPreferences* web_prefs) {
Profile* profile = Profile::FromBrowserContext(
@@ -2760,13 +2765,12 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
}
void ChromeContentBrowserClient::ClearCache(RenderFrameHost* rfh) {
- Profile* profile = Profile::FromBrowserContext(
- rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
- BrowsingDataRemover* remover =
- BrowsingDataRemoverFactory::GetForBrowserContext(profile);
+ content::BrowsingDataRemover* remover =
+ content::BrowserContext::GetBrowsingDataRemover(
+ rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
remover->Remove(base::Time(), base::Time::Max(),
- BrowsingDataRemover::DATA_TYPE_CACHE,
- BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB);
+ content::BrowsingDataRemover::DATA_TYPE_CACHE,
+ content::BrowsingDataRemover::ORIGIN_TYPE_UNPROTECTED_WEB);
}
void ChromeContentBrowserClient::ClearSiteData(
@@ -2776,8 +2780,8 @@ void ChromeContentBrowserClient::ClearSiteData(
bool remove_storage,
bool remove_cache,
const base::Closure& callback) {
- BrowsingDataRemover* remover =
- BrowsingDataRemoverFactory::GetForBrowserContext(browser_context);
+ content::BrowsingDataRemover* remover =
+ content::BrowserContext::GetBrowsingDataRemover(browser_context);
// ClearSiteDataObserver deletes itself when callbacks from both removal
// tasks are received.
@@ -2804,8 +2808,8 @@ void ChromeContentBrowserClient::ClearSiteData(
remover->RemoveWithFilterAndReply(
base::Time(), base::Time::Max(),
- BrowsingDataRemover::DATA_TYPE_COOKIES |
- BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
+ content::BrowsingDataRemover::DATA_TYPE_COOKIES |
+ content::BrowsingDataRemover::DATA_TYPE_CHANNEL_IDS |
ChromeBrowsingDataRemoverDelegate::DATA_TYPE_PLUGIN_DATA,
ChromeBrowsingDataRemoverDelegate::ALL_ORIGIN_TYPES,
std::move(domain_filter_builder), observer);
@@ -2817,9 +2821,9 @@ void ChromeContentBrowserClient::ClearSiteData(
// Delete origin-scoped data.
int remove_mask = 0;
if (remove_storage)
- remove_mask |= BrowsingDataRemover::DATA_TYPE_DOM_STORAGE;
+ remove_mask |= content::BrowsingDataRemover::DATA_TYPE_DOM_STORAGE;
if (remove_cache)
- remove_mask |= BrowsingDataRemover::DATA_TYPE_CACHE;
+ remove_mask |= content::BrowsingDataRemover::DATA_TYPE_CACHE;
if (remove_mask) {
std::unique_ptr<BrowsingDataFilterBuilder> origin_filter_builder(

Powered by Google App Engine
This is Rietveld 408576698