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

Side by Side Diff: chrome/common/chrome_content_client.cc

Issue 2850793005: Remove command line/field trial support and configs for Isolate Extensions. (Closed)
Patch Set: Rebase. Created 3 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/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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 #include "base/win/windows_version.h" 64 #include "base/win/windows_version.h"
65 #endif 65 #endif
66 66
67 #if !defined(DISABLE_NACL) 67 #if !defined(DISABLE_NACL)
68 #include "components/nacl/common/nacl_constants.h" 68 #include "components/nacl/common/nacl_constants.h"
69 #include "components/nacl/common/nacl_process_type.h" 69 #include "components/nacl/common/nacl_process_type.h"
70 #include "components/nacl/common/nacl_sandbox_type.h" 70 #include "components/nacl/common/nacl_sandbox_type.h"
71 #endif 71 #endif
72 72
73 #if BUILDFLAG(ENABLE_EXTENSIONS) 73 #if BUILDFLAG(ENABLE_EXTENSIONS)
74 #include "chrome/common/extensions/extension_process_policy.h"
75 #include "extensions/common/features/feature_util.h" 74 #include "extensions/common/features/feature_util.h"
76 #endif 75 #endif
77 76
78 #if BUILDFLAG(ENABLE_PLUGINS) 77 #if BUILDFLAG(ENABLE_PLUGINS)
79 #include "content/public/common/pepper_plugin_info.h" 78 #include "content/public/common/pepper_plugin_info.h"
80 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR. 79 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR.
81 #include "ppapi/shared_impl/ppapi_permissions.h" // nogncheck 80 #include "ppapi/shared_impl/ppapi_permissions.h" // nogncheck
82 #endif 81 #endif
83 82
84 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \ 83 #if defined(WIDEVINE_CDM_AVAILABLE) && BUILDFLAG(ENABLE_PEPPER_CDMS) && \
(...skipping 597 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 const GURL& script_url) { 681 const GURL& script_url) {
683 #if BUILDFLAG(ENABLE_EXTENSIONS) 682 #if BUILDFLAG(ENABLE_EXTENSIONS)
684 return script_url.SchemeIs(extensions::kExtensionScheme); 683 return script_url.SchemeIs(extensions::kExtensionScheme);
685 #else 684 #else
686 return false; 685 return false;
687 #endif 686 #endif
688 } 687 }
689 688
690 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { 689 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
691 #if BUILDFLAG(ENABLE_EXTENSIONS) 690 #if BUILDFLAG(ENABLE_EXTENSIONS)
692 return extensions::IsIsolateExtensionsEnabled(); 691 return true;
693 #else 692 #else
694 return false; 693 return false;
695 #endif 694 #endif
696 } 695 }
697 696
698 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() { 697 content::OriginTrialPolicy* ChromeContentClient::GetOriginTrialPolicy() {
699 if (!origin_trial_policy_) 698 if (!origin_trial_policy_)
700 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>(); 699 origin_trial_policy_ = base::MakeUnique<ChromeOriginTrialPolicy>();
701 return origin_trial_policy_.get(); 700 return origin_trial_policy_.get();
702 } 701 }
703 702
704 #if defined(OS_ANDROID) 703 #if defined(OS_ANDROID)
705 media::MediaDrmBridgeClient* ChromeContentClient::GetMediaDrmBridgeClient() { 704 media::MediaDrmBridgeClient* ChromeContentClient::GetMediaDrmBridgeClient() {
706 return new ChromeMediaDrmBridgeClient(); 705 return new ChromeMediaDrmBridgeClient();
707 } 706 }
708 #endif // OS_ANDROID 707 #endif // OS_ANDROID
OLDNEW
« no previous file with comments | « chrome/browser/site_details_browsertest.cc ('k') | chrome/common/extensions/extension_process_policy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698