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

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

Issue 2576573002: Move enable_pdf to a buildflag header. (Closed)
Patch Set: No Chromecast Created 4 years 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/common/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 "pdf/features.h"
54 #include "ppapi/features/features.h" 55 #include "ppapi/features/features.h"
55 #include "printing/features/features.h" 56 #include "printing/features/features.h"
56 #include "ui/base/material_design/material_design_controller.h" 57 #include "ui/base/material_design/material_design_controller.h"
57 #include "ui/base/resource/resource_bundle.h" 58 #include "ui/base/resource/resource_bundle.h"
58 #include "ui/base/ui_base_switches.h" 59 #include "ui/base/ui_base_switches.h"
59 60
60 #if defined(OS_WIN) 61 #if defined(OS_WIN)
61 #include <atlbase.h> 62 #include <atlbase.h>
62 #include <malloc.h> 63 #include <malloc.h>
63 #include <algorithm> 64 #include <algorithm>
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after
918 SuppressWindowsErrorDialogs(); 919 SuppressWindowsErrorDialogs();
919 #endif 920 #endif
920 921
921 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER) 922 #if defined(CHROME_MULTIPLE_DLL_CHILD) || !defined(CHROME_MULTIPLE_DLL_BROWSER)
922 #if !defined(DISABLE_NACL) 923 #if !defined(DISABLE_NACL)
923 ChromeContentClient::SetNaClEntryFunctions( 924 ChromeContentClient::SetNaClEntryFunctions(
924 nacl_plugin::PPP_GetInterface, 925 nacl_plugin::PPP_GetInterface,
925 nacl_plugin::PPP_InitializeModule, 926 nacl_plugin::PPP_InitializeModule,
926 nacl_plugin::PPP_ShutdownModule); 927 nacl_plugin::PPP_ShutdownModule);
927 #endif 928 #endif
928 #if BUILDFLAG(ENABLE_PLUGINS) && defined(ENABLE_PDF) 929 #if BUILDFLAG(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_PDF)
929 ChromeContentClient::SetPDFEntryFunctions( 930 ChromeContentClient::SetPDFEntryFunctions(
930 chrome_pdf::PPP_GetInterface, 931 chrome_pdf::PPP_GetInterface,
931 chrome_pdf::PPP_InitializeModule, 932 chrome_pdf::PPP_InitializeModule,
932 chrome_pdf::PPP_ShutdownModule); 933 chrome_pdf::PPP_ShutdownModule);
933 #endif 934 #endif
934 #endif 935 #endif
935 } 936 }
936 937
937 int ChromeMainDelegate::RunProcess( 938 int ChromeMainDelegate::RunProcess(
938 const std::string& process_type, 939 const std::string& process_type,
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 case version_info::Channel::CANARY: 1085 case version_info::Channel::CANARY:
1085 return true; 1086 return true;
1086 case version_info::Channel::DEV: 1087 case version_info::Channel::DEV:
1087 case version_info::Channel::BETA: 1088 case version_info::Channel::BETA:
1088 case version_info::Channel::STABLE: 1089 case version_info::Channel::STABLE:
1089 default: 1090 default:
1090 // Don't enable instrumentation. 1091 // Don't enable instrumentation.
1091 return false; 1092 return false;
1092 } 1093 }
1093 } 1094 }
OLDNEW
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/common/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698