From e51029943e0a38dd794b73caaf6373d5496ae783 Mon Sep 17 00:00:00 2001 From: Maggie Cai Date: Fri, 25 Jan 2019 00:28:51 +0000 Subject: [PATCH] Settings: Clean up unused header includes and methods. Now we are fetching storage data using CookiesTreeModel, some of the headers and methods are no longer needed. No functional change. BUG=835712 Change-Id: I7eef4a97aab128cf2df18c1d4b9e9c5547034173 Reviewed-on: https://chromium-review.googlesource.com/c/1433377 Reviewed-by: Dominick Ng Reviewed-by: Steven Bennetts Commit-Queue: Maggie Cai Cr-Commit-Position: refs/heads/master@{#625896} --- .../ui/webui/settings/site_settings_handler.cc | 14 +------------- .../ui/webui/settings/site_settings_handler.h | 8 -------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc index fb90a10d06521..4201c6613d15a 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler.cc +++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc @@ -5,11 +5,8 @@ #include "chrome/browser/ui/webui/settings/site_settings_handler.h" #include -#include -#include -#include -#include #include +#include #include "base/barrier_closure.h" #include "base/bind.h" @@ -50,7 +47,6 @@ #include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "content/public/browser/storage_usage_info.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/common/origin_util.h" @@ -59,8 +55,6 @@ #include "extensions/browser/extension_registry.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "storage/browser/quota/quota_manager.h" -#include "third_party/blink/public/mojom/quota/quota_types.mojom.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" @@ -1486,12 +1480,6 @@ void SiteSettingsHandler::GetOriginCookies( } } -BrowsingDataLocalStorageHelper* SiteSettingsHandler::GetLocalStorageHelper() { - if (!local_storage_helper_) - local_storage_helper_ = new BrowsingDataLocalStorageHelper(profile_); - return local_storage_helper_.get(); -} - void SiteSettingsHandler::HandleClearEtldPlus1DataAndCookies( const base::ListValue* args) { CHECK_EQ(1U, args->GetSize()); diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.h b/chrome/browser/ui/webui/settings/site_settings_handler.h index 1336fea336220..cac3cce681e2f 100644 --- a/chrome/browser/ui/webui/settings/site_settings_handler.h +++ b/chrome/browser/ui/webui/settings/site_settings_handler.h @@ -5,24 +5,20 @@ #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_SITE_SETTINGS_HANDLER_H_ #define CHROME_BROWSER_UI_WEBUI_SETTINGS_SITE_SETTINGS_HANDLER_H_ -#include #include #include #include #include -#include #include "base/scoped_observer.h" #include "chrome/browser/browsing_data/cookies_tree_model.h" #include "chrome/browser/permissions/chooser_context_base.h" -#include "chrome/browser/storage/storage_info_fetcher.h" #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h" #include "components/content_settings/core/browser/content_settings_observer.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" #include "ppapi/buildflags/buildflags.h" -#include "third_party/blink/public/mojom/quota/quota_types.mojom.h" class HostContentSettingsMap; class Profile; @@ -233,8 +229,6 @@ class SiteSettingsHandler : public SettingsPageUIHandler, // Updates the block autoplay enabled pref when the UI is toggled. void HandleSetBlockAutoplayEnabled(const base::ListValue* args); - BrowsingDataLocalStorageHelper* GetLocalStorageHelper(); - // Clear web storage data and cookies from cookies tree model for an ETLD+1. void HandleClearEtldPlus1DataAndCookies(const base::ListValue* args); @@ -267,8 +261,6 @@ class SiteSettingsHandler : public SettingsPageUIHandler, // Change observer for prefs. std::unique_ptr pref_change_registrar_; - scoped_refptr local_storage_helper_; - std::unique_ptr cookies_tree_model_; // Whether to send all sites list on cookie tree model update.