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

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

Issue 1406053002: Make chrome/common pass "gn check" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 2 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 | « chrome/common/BUILD.gn ('k') | chrome/common/chrome_paths_android.cc » ('j') | 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 "chrome/common/chrome_content_client.h" 5 #include "chrome/common/chrome_content_client.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #endif // defined(OS_LINUX) 9 #endif // defined(OS_LINUX)
10 10
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "components/nacl/common/nacl_sandbox_type.h" 61 #include "components/nacl/common/nacl_sandbox_type.h"
62 #endif 62 #endif
63 63
64 #if defined(ENABLE_EXTENSIONS) 64 #if defined(ENABLE_EXTENSIONS)
65 #include "extensions/common/features/behavior_feature.h" 65 #include "extensions/common/features/behavior_feature.h"
66 #include "extensions/common/features/feature_provider.h" 66 #include "extensions/common/features/feature_provider.h"
67 #endif 67 #endif
68 68
69 #if defined(ENABLE_PLUGINS) 69 #if defined(ENABLE_PLUGINS)
70 #include "content/public/common/pepper_plugin_info.h" 70 #include "content/public/common/pepper_plugin_info.h"
71 #include "flapper_version.h" // In SHARED_INTERMEDIATE_DIR. 71 #include "flapper_version.h" // nogncheck In SHARED_INTERMEDIATE_DIR.
72 #include "ppapi/shared_impl/ppapi_permissions.h" 72 #include "ppapi/shared_impl/ppapi_permissions.h"
73 #endif 73 #endif
74 74
75 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \ 75 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(ENABLE_PEPPER_CDMS) && \
76 !defined(WIDEVINE_CDM_IS_COMPONENT) 76 !defined(WIDEVINE_CDM_IS_COMPONENT)
77 #include "chrome/common/widevine_cdm_constants.h" 77 #include "chrome/common/widevine_cdm_constants.h"
78 #endif 78 #endif
79 79
80 namespace { 80 namespace {
81 81
(...skipping 543 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 ->IsAvailableToEnvironment() 625 ->IsAvailableToEnvironment()
626 .is_available()) 626 .is_available())
627 schemes->insert(extensions::kExtensionScheme); 627 schemes->insert(extensions::kExtensionScheme);
628 #endif 628 #endif
629 } 629 }
630 630
631 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() { 631 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
632 return base::CommandLine::ForCurrentProcess()->HasSwitch( 632 return base::CommandLine::ForCurrentProcess()->HasSwitch(
633 switches::kIsolateExtensions); 633 switches::kIsolateExtensions);
634 } 634 }
OLDNEW
« no previous file with comments | « chrome/common/BUILD.gn ('k') | chrome/common/chrome_paths_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698