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

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

Issue 2458833005: Move printing defines to buildflag system. (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/chrome_dll.rc ('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 "printing/features/features.h"
54 #include "ui/base/material_design/material_design_controller.h" 55 #include "ui/base/material_design/material_design_controller.h"
55 #include "ui/base/resource/resource_bundle.h" 56 #include "ui/base/resource/resource_bundle.h"
56 #include "ui/base/ui_base_switches.h" 57 #include "ui/base/ui_base_switches.h"
57 58
58 #if defined(OS_WIN) 59 #if defined(OS_WIN)
59 #include <atlbase.h> 60 #include <atlbase.h>
60 #include <malloc.h> 61 #include <malloc.h>
61 #include <algorithm> 62 #include <algorithm>
62 #include "base/debug/close_handle_hook_win.h" 63 #include "base/debug/close_handle_hook_win.h"
63 #include "chrome/browser/downgrade/user_data_downgrade.h" 64 #include "chrome/browser/downgrade/user_data_downgrade.h"
(...skipping 839 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 #endif 904 #endif
904 } 905 }
905 906
906 int ChromeMainDelegate::RunProcess( 907 int ChromeMainDelegate::RunProcess(
907 const std::string& process_type, 908 const std::string& process_type,
908 const content::MainFunctionParams& main_function_params) { 909 const content::MainFunctionParams& main_function_params) {
909 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize 910 // ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize
910 // doesn't support empty array. So we comment out the block for Android. 911 // doesn't support empty array. So we comment out the block for Android.
911 #if !defined(OS_ANDROID) 912 #if !defined(OS_ANDROID)
912 static const MainFunction kMainFunctions[] = { 913 static const MainFunction kMainFunctions[] = {
913 #if defined(ENABLE_PRINT_PREVIEW) && !defined(CHROME_MULTIPLE_DLL_CHILD) 914 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(CHROME_MULTIPLE_DLL_CHILD)
914 { switches::kServiceProcess, ServiceProcessMain }, 915 { switches::kServiceProcess, ServiceProcessMain },
915 #endif 916 #endif
916 917
917 #if defined(OS_MACOSX) 918 #if defined(OS_MACOSX)
918 { switches::kRelauncherProcess, 919 { switches::kRelauncherProcess,
919 mac_relauncher::internal::RelauncherMain }, 920 mac_relauncher::internal::RelauncherMain },
920 #endif 921 #endif
921 922
922 // This entry is not needed on Linux, where the NaCl loader 923 // This entry is not needed on Linux, where the NaCl loader
923 // process is launched via nacl_helper instead. 924 // process is launched via nacl_helper instead.
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
1053 case version_info::Channel::CANARY: 1054 case version_info::Channel::CANARY:
1054 return true; 1055 return true;
1055 case version_info::Channel::DEV: 1056 case version_info::Channel::DEV:
1056 case version_info::Channel::BETA: 1057 case version_info::Channel::BETA:
1057 case version_info::Channel::STABLE: 1058 case version_info::Channel::STABLE:
1058 default: 1059 default:
1059 // Don't enable instrumentation. 1060 // Don't enable instrumentation.
1060 return false; 1061 return false;
1061 } 1062 }
1062 } 1063 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_dll.rc ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698