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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_helper.cc

Issue 273193004: Move some content url constants to /url. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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/browsing_data/browsing_data_helper.h" 5 #include "chrome/browser/browsing_data/browsing_data_helper.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/extensions/extension_special_storage_policy.h" 9 #include "chrome/browser/extensions/extension_special_storage_policy.h"
10 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "content/public/browser/child_process_security_policy.h" 12 #include "content/public/browser/child_process_security_policy.h"
13 #include "extensions/common/constants.h" 13 #include "extensions/common/constants.h"
14 #include "url/gurl.h" 14 #include "url/gurl.h"
15 15
16 // Static 16 // Static
17 bool BrowsingDataHelper::IsWebScheme(const std::string& scheme) { 17 bool BrowsingDataHelper::IsWebScheme(const std::string& scheme) {
18 // Special-case `file://` scheme iff cookies and site data are enabled via 18 // Special-case `file://` scheme iff cookies and site data are enabled via
19 // the `--allow-file-cookies` CLI flag. 19 // the `--allow-file-cookies` CLI flag.
20 if (scheme == content::kFileScheme) { 20 if (scheme == url::kFileScheme) {
21 return CommandLine::ForCurrentProcess()->HasSwitch( 21 return CommandLine::ForCurrentProcess()->HasSwitch(
22 switches::kEnableFileCookies); 22 switches::kEnableFileCookies);
23 23
24 // Otherwise, all "web safe" schemes are valid, except `chrome-extension://` 24 // Otherwise, all "web safe" schemes are valid, except `chrome-extension://`
25 // and `chrome-devtools://`. 25 // and `chrome-devtools://`.
26 } else { 26 } else {
27 content::ChildProcessSecurityPolicy* policy = 27 content::ChildProcessSecurityPolicy* policy =
28 content::ChildProcessSecurityPolicy::GetInstance(); 28 content::ChildProcessSecurityPolicy::GetInstance();
29 return (policy->IsWebSafeScheme(scheme) && 29 return (policy->IsWebSafeScheme(scheme) &&
30 !BrowsingDataHelper::IsExtensionScheme(scheme) && 30 !BrowsingDataHelper::IsExtensionScheme(scheme) &&
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 return true; 62 return true;
63 63
64 // Hosted applications (protected and websafe origins) iff PROTECTED_WEB. 64 // Hosted applications (protected and websafe origins) iff PROTECTED_WEB.
65 if (policy->IsStorageProtected(origin.GetOrigin()) && 65 if (policy->IsStorageProtected(origin.GetOrigin()) &&
66 BrowsingDataHelper::HasWebScheme(origin.GetOrigin()) && 66 BrowsingDataHelper::HasWebScheme(origin.GetOrigin()) &&
67 origin_set_mask & PROTECTED_WEB) 67 origin_set_mask & PROTECTED_WEB)
68 return true; 68 return true;
69 69
70 return false; 70 return false;
71 } 71 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698