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

Side by Side Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 535773002: Android: Remove more browser extensions code, including some that snuck back in. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 3 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/content_settings/host_content_settings_map.h" 5 #include "chrome/browser/content_settings/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"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
15 #include "base/time/clock.h" 15 #include "base/time/clock.h"
16 #include "chrome/browser/chrome_notification_types.h" 16 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h" 17 #include "chrome/browser/content_settings/content_settings_custom_extension_prov ider.h"
18 #include "chrome/browser/content_settings/content_settings_default_provider.h" 18 #include "chrome/browser/content_settings/content_settings_default_provider.h"
19 #include "chrome/browser/content_settings/content_settings_details.h" 19 #include "chrome/browser/content_settings/content_settings_details.h"
20 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h" 20 #include "chrome/browser/content_settings/content_settings_internal_extension_pr ovider.h"
21 #include "chrome/browser/content_settings/content_settings_observable_provider.h " 21 #include "chrome/browser/content_settings/content_settings_observable_provider.h "
22 #include "chrome/browser/content_settings/content_settings_policy_provider.h" 22 #include "chrome/browser/content_settings/content_settings_policy_provider.h"
23 #include "chrome/browser/content_settings/content_settings_pref_provider.h" 23 #include "chrome/browser/content_settings/content_settings_pref_provider.h"
24 #include "chrome/browser/content_settings/content_settings_provider.h" 24 #include "chrome/browser/content_settings/content_settings_provider.h"
25 #include "chrome/browser/content_settings/content_settings_rule.h" 25 #include "chrome/browser/content_settings/content_settings_rule.h"
26 #include "chrome/browser/content_settings/content_settings_utils.h" 26 #include "chrome/browser/content_settings/content_settings_utils.h"
27 #include "chrome/browser/extensions/api/content_settings/content_settings_servic e.h" 27 #include "chrome/browser/extensions/api/content_settings/content_settings_servic e.h"
28 #include "chrome/browser/extensions/extension_service.h"
29 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
31 #include "chrome/common/url_constants.h" 30 #include "chrome/common/url_constants.h"
32 #include "components/content_settings/core/common/content_settings_pattern.h" 31 #include "components/content_settings/core/common/content_settings_pattern.h"
33 #include "components/pref_registry/pref_registry_syncable.h" 32 #include "components/pref_registry/pref_registry_syncable.h"
34 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
35 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
36 #include "content/public/browser/notification_source.h" 35 #include "content/public/browser/notification_source.h"
37 #include "content/public/browser/user_metrics.h" 36 #include "content/public/browser/user_metrics.h"
38 #include "content/public/common/content_switches.h" 37 #include "content/public/common/content_switches.h"
39 #include "extensions/browser/extension_prefs.h"
40 #include "extensions/common/constants.h"
41 #include "net/base/net_errors.h" 38 #include "net/base/net_errors.h"
42 #include "net/base/static_cookie_policy.h" 39 #include "net/base/static_cookie_policy.h"
43 #include "url/gurl.h" 40 #include "url/gurl.h"
44 41
42 #if defined(ENABLE_EXTENSIONS)
43 #include "chrome/browser/extensions/extension_service.h"
44 #include "extensions/browser/extension_prefs.h"
45 #include "extensions/common/constants.h"
46 #endif
47
45 using base::UserMetricsAction; 48 using base::UserMetricsAction;
46 using content::BrowserThread; 49 using content::BrowserThread;
47 50
48 namespace { 51 namespace {
49 52
50 typedef std::vector<content_settings::Rule> Rules; 53 typedef std::vector<content_settings::Rule> Rules;
51 54
52 typedef std::pair<std::string, std::string> StringPair; 55 typedef std::pair<std::string, std::string> StringPair;
53 56
54 // TODO(bauerb): Expose constants. 57 // TODO(bauerb): Expose constants.
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
667 #if defined(OS_ANDROID) || defined(OS_CHROMEOS) 670 #if defined(OS_ANDROID) || defined(OS_CHROMEOS)
668 if (content_type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) { 671 if (content_type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER) {
669 return false; 672 return false;
670 } 673 }
671 #endif 674 #endif
672 if (secondary_url.SchemeIs(content::kChromeUIScheme) && 675 if (secondary_url.SchemeIs(content::kChromeUIScheme) &&
673 content_type == CONTENT_SETTINGS_TYPE_COOKIES && 676 content_type == CONTENT_SETTINGS_TYPE_COOKIES &&
674 primary_url.SchemeIsSecure()) { 677 primary_url.SchemeIsSecure()) {
675 return true; 678 return true;
676 } 679 }
680 #if defined(ENABLE_EXTENSIONS)
677 if (primary_url.SchemeIs(extensions::kExtensionScheme)) { 681 if (primary_url.SchemeIs(extensions::kExtensionScheme)) {
678 switch (content_type) { 682 switch (content_type) {
679 case CONTENT_SETTINGS_TYPE_PLUGINS: 683 case CONTENT_SETTINGS_TYPE_PLUGINS:
680 case CONTENT_SETTINGS_TYPE_MEDIASTREAM: 684 case CONTENT_SETTINGS_TYPE_MEDIASTREAM:
681 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC: 685 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC:
682 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA: 686 case CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA:
683 return false; 687 return false;
684 case CONTENT_SETTINGS_TYPE_COOKIES: 688 case CONTENT_SETTINGS_TYPE_COOKIES:
685 return secondary_url.SchemeIs(extensions::kExtensionScheme); 689 return secondary_url.SchemeIs(extensions::kExtensionScheme);
686 default: 690 default:
687 return true; 691 return true;
688 } 692 }
689 } 693 }
694 #endif
690 return primary_url.SchemeIs(content::kChromeDevToolsScheme) || 695 return primary_url.SchemeIs(content::kChromeDevToolsScheme) ||
691 primary_url.SchemeIs(content::kChromeUIScheme); 696 primary_url.SchemeIs(content::kChromeUIScheme);
692 } 697 }
693 698
694 base::Value* HostContentSettingsMap::GetWebsiteSetting( 699 base::Value* HostContentSettingsMap::GetWebsiteSetting(
695 const GURL& primary_url, 700 const GURL& primary_url,
696 const GURL& secondary_url, 701 const GURL& secondary_url,
697 ContentSettingsType content_type, 702 ContentSettingsType content_type,
698 const std::string& resource_identifier, 703 const std::string& resource_identifier,
699 content_settings::SettingInfo* info) const { 704 content_settings::SettingInfo* info) const {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
751 } 756 }
752 757
753 NOTREACHED(); 758 NOTREACHED();
754 return DEFAULT_PROVIDER; 759 return DEFAULT_PROVIDER;
755 } 760 }
756 761
757 content_settings::PrefProvider* HostContentSettingsMap::GetPrefProvider() { 762 content_settings::PrefProvider* HostContentSettingsMap::GetPrefProvider() {
758 return static_cast<content_settings::PrefProvider*>( 763 return static_cast<content_settings::PrefProvider*>(
759 content_settings_providers_[PREF_PROVIDER]); 764 content_settings_providers_[PREF_PROVIDER]);
760 } 765 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698