OLD | NEW |
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/common/chrome_content_client.h" | 5 #include "chrome/common/chrome_content_client.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <memory> | 10 #include <memory> |
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
681 const GURL& script_url) { | 681 const GURL& script_url) { |
682 #if BUILDFLAG(ENABLE_EXTENSIONS) | 682 #if BUILDFLAG(ENABLE_EXTENSIONS) |
683 return script_url.SchemeIs(extensions::kExtensionScheme); | 683 return script_url.SchemeIs(extensions::kExtensionScheme); |
684 #else | 684 #else |
685 return false; | 685 return false; |
686 #endif | 686 #endif |
687 } | 687 } |
688 | 688 |
689 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { | 689 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { |
690 #if BUILDFLAG(ENABLE_EXTENSIONS) | 690 #if BUILDFLAG(ENABLE_EXTENSIONS) |
691 return extensions::IsIsolateExtensionsEnabled(); | 691 return true; |
692 #else | 692 #else |
693 return false; | 693 return false; |
694 #endif | 694 #endif |
695 } | 695 } |
696 | 696 |
697 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { | 697 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { |
698 if (!origin_trial_policy_) | 698 if (!origin_trial_policy_) |
699 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); | 699 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); |
700 return origin_trial_policy_.get(); | 700 return origin_trial_policy_.get(); |
701 } | 701 } |
702 | 702 |
703 #if defined(OS_ANDROID) | 703 #if defined(OS_ANDROID) |
704 media::MediaDrmBridgeClient* ChromeContentClient::GetMediaDrmBridgeClient() { | 704 media::MediaDrmBridgeClient* ChromeContentClient::GetMediaDrmBridgeClient() { |
705 return new ChromeMediaDrmBridgeClient(); | 705 return new ChromeMediaDrmBridgeClient(); |
706 } | 706 } |
707 #endif // OS_ANDROID | 707 #endif // OS_ANDROID |
OLD | NEW |