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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 2512563003: Convert enable_plugins to a buildflag header. (Closed)
Patch Set: Merge Created 4 years, 1 month 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/app/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <string> 8 #include <string>
9 9
10 #include "base/base_paths.h" 10 #include "base/base_paths.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 #include "chrome/renderer/chrome_content_renderer_client.h" 44 #include "chrome/renderer/chrome_content_renderer_client.h"
45 #include "chrome/utility/chrome_content_utility_client.h" 45 #include "chrome/utility/chrome_content_utility_client.h"
46 #include "components/component_updater/component_updater_paths.h" 46 #include "components/component_updater/component_updater_paths.h"
47 #include "components/content_settings/core/common/content_settings_pattern.h" 47 #include "components/content_settings/core/common/content_settings_pattern.h"
48 #include "components/crash/content/app/crash_reporter_client.h" 48 #include "components/crash/content/app/crash_reporter_client.h"
49 #include "components/version_info/version_info.h" 49 #include "components/version_info/version_info.h"
50 #include "content/public/common/content_client.h" 50 #include "content/public/common/content_client.h"
51 #include "content/public/common/content_paths.h" 51 #include "content/public/common/content_paths.h"
52 #include "content/public/common/content_switches.h" 52 #include "content/public/common/content_switches.h"
53 #include "extensions/common/constants.h" 53 #include "extensions/common/constants.h"
54 #include "ppapi/features/features.h"
54 #include "printing/features/features.h" 55 #include "printing/features/features.h"
55 #include "ui/base/material_design/material_design_controller.h" 56 #include "ui/base/material_design/material_design_controller.h"
56 #include "ui/base/resource/resource_bundle.h" 57 #include "ui/base/resource/resource_bundle.h"
57 #include "ui/base/ui_base_switches.h" 58 #include "ui/base/ui_base_switches.h"
58 59
59 #if defined(OS_WIN) 60 #if defined(OS_WIN)
60 #include <atlbase.h> 61 #include <atlbase.h>
61 #include <malloc.h> 62 #include <malloc.h>
62 #include <algorithm> 63 #include <algorithm>
63 #include "base/debug/close_handle_hook_win.h" 64 #include "base/debug/close_handle_hook_win.h"
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 132
132 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
133 #include "components/metrics/leak_detector/leak_detector.h" 134 #include "components/metrics/leak_detector/leak_detector.h"
134 #endif 135 #endif
135 136
136 #if !defined(DISABLE_NACL) 137 #if !defined(DISABLE_NACL)
137 #include "components/nacl/common/nacl_switches.h" 138 #include "components/nacl/common/nacl_switches.h"
138 #include "components/nacl/renderer/plugin/ppapi_entrypoints.h" 139 #include "components/nacl/renderer/plugin/ppapi_entrypoints.h"
139 #endif 140 #endif
140 141
141 #if defined(ENABLE_PLUGINS) && (defined(CHROME_MULTIPLE_DLL_CHILD) || \ 142 #if BUILDFLAG(ENABLE_PLUGINS) && (defined(CHROME_MULTIPLE_DLL_CHILD) || \
142 !defined(CHROME_MULTIPLE_DLL_BROWSER)) 143 !defined(CHROME_MULTIPLE_DLL_BROWSER))
143 #include "pdf/pdf.h" 144 #include "pdf/pdf.h"
144 #endif 145 #endif
145 146
146 #if !defined(CHROME_MULTIPLE_DLL_CHILD) 147 #if !defined(CHROME_MULTIPLE_DLL_CHILD)
147 #include "components/startup_metric_utils/browser/startup_metric_utils.h" 148 #include "components/startup_metric_utils/browser/startup_metric_utils.h"
148 #endif 149 #endif
149 150
150 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) 151 #if !defined(CHROME_MULTIPLE_DLL_BROWSER)
151 #include "chrome/child/pdf_child_init.h" 152 #include "chrome/child/pdf_child_init.h"
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 SuppressWindowsErrorDialogs(); 889 SuppressWindowsErrorDialogs();
889 #endif 890 #endif
890 891
891 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER) 892 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER)
892 #if !defined(DISABLE_NACL) 893 #if !defined(DISABLE_NACL)
893 ChromeContentClient::SetNaClEntryFunctions( 894 ChromeContentClient::SetNaClEntryFunctions(
894 nacl_plugin::PPP_GetInterface, 895 nacl_plugin::PPP_GetInterface,
895 nacl_plugin::PPP_InitializeModule, 896 nacl_plugin::PPP_InitializeModule,
896 nacl_plugin::PPP_ShutdownModule); 897 nacl_plugin::PPP_ShutdownModule);
897 #endif 898 #endif
898 #if defined(ENABLE_PLUGINS) && defined(ENABLE_PDF) 899 #if BUILDFLAG(ENABLE_PLUGINS) && defined(ENABLE_PDF)
899 ChromeContentClient::SetPDFEntryFunctions( 900 ChromeContentClient::SetPDFEntryFunctions(
900 chrome_pdf::PPP_GetInterface, 901 chrome_pdf::PPP_GetInterface,
901 chrome_pdf::PPP_InitializeModule, 902 chrome_pdf::PPP_InitializeModule,
902 chrome_pdf::PPP_ShutdownModule); 903 chrome_pdf::PPP_ShutdownModule);
903 #endif 904 #endif
904 #endif 905 #endif
905 } 906 }
906 907
907 int ChromeMainDelegate::RunProcess( 908 int ChromeMainDelegate::RunProcess(
908 const std::string& process_type, 909 const std::string& process_type,
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 case version_info::Channel::CANARY: 1055 case version_info::Channel::CANARY:
1055 return true; 1056 return true;
1056 case version_info::Channel::DEV: 1057 case version_info::Channel::DEV:
1057 case version_info::Channel::BETA: 1058 case version_info::Channel::BETA:
1058 case version_info::Channel::STABLE: 1059 case version_info::Channel::STABLE:
1059 default: 1060 default:
1060 // Don't enable instrumentation. 1061 // Don't enable instrumentation.
1061 return false; 1062 return false;
1062 } 1063 }
1063 } 1064 }
OLDNEW
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698