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

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 2025683003: First experimental implementation of the Clear-Site-Data header (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments, git cl format Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chrome_content_browser_client.h" 5 #include "chrome/browser/chrome_content_browser_client.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 18 matching lines...) Expand all
29 #include "build/build_config.h" 29 #include "build/build_config.h"
30 #include "chrome/browser/after_startup_task_utils.h" 30 #include "chrome/browser/after_startup_task_utils.h"
31 #include "chrome/browser/apps/app_url_redirector.h" 31 #include "chrome/browser/apps/app_url_redirector.h"
32 #include "chrome/browser/browser_about_handler.h" 32 #include "chrome/browser/browser_about_handler.h"
33 #include "chrome/browser/browser_process.h" 33 #include "chrome/browser/browser_process.h"
34 #include "chrome/browser/browser_shutdown.h" 34 #include "chrome/browser/browser_shutdown.h"
35 #include "chrome/browser/browsing_data/browsing_data_helper.h" 35 #include "chrome/browser/browsing_data/browsing_data_helper.h"
36 #include "chrome/browser/browsing_data/browsing_data_remover.h" 36 #include "chrome/browser/browsing_data/browsing_data_remover.h"
37 #include "components/subresource_filter/content/browser/content_subresource_filt er_driver_factory.h" 37 #include "components/subresource_filter/content/browser/content_subresource_filt er_driver_factory.h"
38 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h" 38 #include "chrome/browser/browsing_data/browsing_data_remover_factory.h"
39 #include "chrome/browser/browsing_data/origin_filter_builder.h"
40 #include "chrome/browser/browsing_data/registrable_domain_filter_builder.h"
39 #include "chrome/browser/character_encoding.h" 41 #include "chrome/browser/character_encoding.h"
40 #include "chrome/browser/chrome_content_browser_client_parts.h" 42 #include "chrome/browser/chrome_content_browser_client_parts.h"
41 #include "chrome/browser/chrome_net_benchmarking_message_filter.h" 43 #include "chrome/browser/chrome_net_benchmarking_message_filter.h"
42 #include "chrome/browser/chrome_quota_permission_context.h" 44 #include "chrome/browser/chrome_quota_permission_context.h"
43 #include "chrome/browser/content_settings/cookie_settings_factory.h" 45 #include "chrome/browser/content_settings/cookie_settings_factory.h"
44 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 46 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
45 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 47 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
46 #include "chrome/browser/defaults.h" 48 #include "chrome/browser/defaults.h"
47 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h" 49 #include "chrome/browser/devtools/chrome_devtools_manager_delegate.h"
48 #include "chrome/browser/download/download_prefs.h" 50 #include "chrome/browser/download/download_prefs.h"
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 #include "content/public/common/content_features.h" 163 #include "content/public/common/content_features.h"
162 #include "content/public/common/content_switches.h" 164 #include "content/public/common/content_switches.h"
163 #include "content/public/common/mojo_shell_connection.h" 165 #include "content/public/common/mojo_shell_connection.h"
164 #include "content/public/common/sandbox_type.h" 166 #include "content/public/common/sandbox_type.h"
165 #include "content/public/common/url_utils.h" 167 #include "content/public/common/url_utils.h"
166 #include "content/public/common/web_preferences.h" 168 #include "content/public/common/web_preferences.h"
167 #include "device/usb/public/interfaces/chooser_service.mojom.h" 169 #include "device/usb/public/interfaces/chooser_service.mojom.h"
168 #include "device/usb/public/interfaces/device_manager.mojom.h" 170 #include "device/usb/public/interfaces/device_manager.mojom.h"
169 #include "gin/v8_initializer.h" 171 #include "gin/v8_initializer.h"
170 #include "net/base/mime_util.h" 172 #include "net/base/mime_util.h"
173 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
171 #include "net/cookies/canonical_cookie.h" 174 #include "net/cookies/canonical_cookie.h"
172 #include "net/cookies/cookie_options.h" 175 #include "net/cookies/cookie_options.h"
173 #include "net/ssl/ssl_cert_request_info.h" 176 #include "net/ssl/ssl_cert_request_info.h"
174 #include "ppapi/host/ppapi_host.h" 177 #include "ppapi/host/ppapi_host.h"
175 #include "services/shell/public/cpp/service.h" 178 #include "services/shell/public/cpp/service.h"
176 #include "storage/browser/fileapi/external_mount_points.h" 179 #include "storage/browser/fileapi/external_mount_points.h"
177 #include "ui/base/l10n/l10n_util.h" 180 #include "ui/base/l10n/l10n_util.h"
178 #include "ui/base/resource/resource_bundle.h" 181 #include "ui/base/resource/resource_bundle.h"
179 #include "ui/resources/grit/ui_resources.h" 182 #include "ui/resources/grit/ui_resources.h"
180 #include "url/gurl.h" 183 #include "url/gurl.h"
(...skipping 2286 matching lines...) Expand 10 before | Expand all | Expand 10 after
2467 void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) { 2470 void ChromeContentBrowserClient::ClearCookies(RenderFrameHost* rfh) {
2468 Profile* profile = Profile::FromBrowserContext( 2471 Profile* profile = Profile::FromBrowserContext(
2469 rfh->GetSiteInstance()->GetProcess()->GetBrowserContext()); 2472 rfh->GetSiteInstance()->GetProcess()->GetBrowserContext());
2470 BrowsingDataRemover* remover = 2473 BrowsingDataRemover* remover =
2471 BrowsingDataRemoverFactory::GetForBrowserContext(profile); 2474 BrowsingDataRemoverFactory::GetForBrowserContext(profile);
2472 int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA; 2475 int remove_mask = BrowsingDataRemover::REMOVE_SITE_DATA;
2473 remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask, 2476 remover->Remove(BrowsingDataRemover::Unbounded(), remove_mask,
2474 BrowsingDataHelper::UNPROTECTED_WEB); 2477 BrowsingDataHelper::UNPROTECTED_WEB);
2475 } 2478 }
2476 2479
2480 void ChromeContentBrowserClient::ClearSiteData(
2481 content::BrowserContext* browser_context,
2482 const url::Origin& origin,
2483 bool remove_cookies,
2484 bool remove_storage,
2485 bool remove_cache) {
2486 BrowsingDataRemover* remover =
2487 BrowsingDataRemoverFactory::GetForBrowserContext(browser_context);
2488
2489 // Cookies and channel IDs are scoped to
2490 // a) eTLD+1 of |origin|'s host if |origin|'s host is a registrable domain
2491 // or a subdomain thereof
2492 // b) |origin|'s host exactly if it is an IP address or an internal hostname
2493 // (e.g. "localhost" or "fileserver").
2494 int remove_mask = 0;
2495 if (remove_cookies) {
2496 remove_mask |= BrowsingDataRemover::REMOVE_COOKIES |
2497 BrowsingDataRemover::REMOVE_CHANNEL_IDS;
2498 }
2499
2500 std::string domain = GetDomainAndRegistry(
2501 origin.host(),
2502 net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
2503 if (domain.empty())
2504 domain = origin.host(); // IP address or internal hostname.
2505
2506 if (remove_mask) {
2507 RegistrableDomainFilterBuilder domain_filter_builder(
2508 BrowsingDataFilterBuilder::WHITELIST);
2509 domain_filter_builder.AddRegisterableDomain(domain);
2510
2511 remover->RemoveWithFilter(
2512 BrowsingDataRemover::Period(browsing_data::TimePeriod::EVERYTHING),
2513 remove_mask, BrowsingDataHelper::ALL, domain_filter_builder);
2514 }
2515
2516 // Delete origin-scoped data.
2517 remove_mask = 0;
2518 if (remove_storage) {
2519 remove_mask |= BrowsingDataRemover::REMOVE_SITE_DATA &
2520 ~BrowsingDataRemover::REMOVE_COOKIES &
2521 ~BrowsingDataRemover::REMOVE_CHANNEL_IDS;
2522 }
2523 if (remove_cache)
2524 remove_mask |= BrowsingDataRemover::REMOVE_CACHE;
2525
2526 if (remove_mask) {
2527 OriginFilterBuilder origin_filter_builder(
2528 BrowsingDataFilterBuilder::WHITELIST);
2529 origin_filter_builder.AddOrigin(origin);
2530
2531 remover->RemoveWithFilter(
2532 BrowsingDataRemover::Period(browsing_data::TimePeriod::EVERYTHING),
2533 remove_mask, BrowsingDataHelper::ALL, origin_filter_builder);
2534 }
2535 }
2536
2477 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { 2537 base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
2478 return DownloadPrefs::GetDefaultDownloadDirectory(); 2538 return DownloadPrefs::GetDefaultDownloadDirectory();
2479 } 2539 }
2480 2540
2481 std::string ChromeContentBrowserClient::GetDefaultDownloadName() { 2541 std::string ChromeContentBrowserClient::GetDefaultDownloadName() {
2482 return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME); 2542 return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
2483 } 2543 }
2484 2544
2485 base::FilePath ChromeContentBrowserClient::GetShaderDiskCacheDirectory() { 2545 base::FilePath ChromeContentBrowserClient::GetShaderDiskCacheDirectory() {
2486 base::FilePath user_data_dir; 2546 base::FilePath user_data_dir;
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
3053 if (channel <= kMaxDisableEncryptionChannel) { 3113 if (channel <= kMaxDisableEncryptionChannel) {
3054 static const char* const kWebRtcDevSwitchNames[] = { 3114 static const char* const kWebRtcDevSwitchNames[] = {
3055 switches::kDisableWebRtcEncryption, 3115 switches::kDisableWebRtcEncryption,
3056 }; 3116 };
3057 to_command_line->CopySwitchesFrom(from_command_line, 3117 to_command_line->CopySwitchesFrom(from_command_line,
3058 kWebRtcDevSwitchNames, 3118 kWebRtcDevSwitchNames,
3059 arraysize(kWebRtcDevSwitchNames)); 3119 arraysize(kWebRtcDevSwitchNames));
3060 } 3120 }
3061 } 3121 }
3062 #endif // defined(ENABLE_WEBRTC) 3122 #endif // defined(ENABLE_WEBRTC)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698