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

Side by Side Diff: components/content_settings/core/browser/host_content_settings_map.cc

Issue 1128363006: Switch Fizzy //components to use SchemeIsCryptographic() instead of SchemeIsSecure(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove stray import. Created 5 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
« no previous file with comments | « components/autofill/content/browser/wallet/wallet_service_url_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "components/content_settings/core/browser/host_content_settings_map.h" 5 #include "components/content_settings/core/browser/host_content_settings_map.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) { 652 content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
653 return false; 653 return false;
654 } 654 }
655 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 655 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
656 if (content_type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) { 656 if (content_type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
657 return false; 657 return false;
658 } 658 }
659 #endif 659 #endif
660 if (secondary_url.SchemeIs(kChromeUIScheme) && 660 if (secondary_url.SchemeIs(kChromeUIScheme) &&
661 content_type == CONTENT_SETTINGS_TYPE_COOKIES && 661 content_type == CONTENT_SETTINGS_TYPE_COOKIES &&
662 primary_url.SchemeIsSecure()) { 662 primary_url.SchemeIsCryptographic()) {
663 return true; 663 return true;
664 } 664 }
665 #if defined(ENABLE_EXTENSIONS) 665 #if defined(ENABLE_EXTENSIONS)
666 if (primary_url.SchemeIs(kExtensionScheme)) { 666 if (primary_url.SchemeIs(kExtensionScheme)) {
667 switch (content_type) { 667 switch (content_type) {
668 case CONTENT_SETTINGS_TYPE_PLUGINS: 668 case CONTENT_SETTINGS_TYPE_PLUGINS:
669 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: 669 case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
670 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: 670 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
671 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: 671 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
672 return false; 672 return false;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
769 } 769 }
770 } 770 }
771 771
772 if (info) { 772 if (info) {
773 info->source = content_settings::SETTING_SOURCE_NONE; 773 info->source = content_settings::SETTING_SOURCE_NONE;
774 info->primary_pattern = ContentSettingsPattern(); 774 info->primary_pattern = ContentSettingsPattern();
775 info->secondary_pattern = ContentSettingsPattern(); 775 info->secondary_pattern = ContentSettingsPattern();
776 } 776 }
777 return scoped_ptr<base::Value>(); 777 return scoped_ptr<base::Value>();
778 } 778 }
OLDNEW
« no previous file with comments | « components/autofill/content/browser/wallet/wallet_service_url_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698