OLD | NEW |
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/browser/chrome_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
951 switches::kAllowScriptingGallery, | 951 switches::kAllowScriptingGallery, |
952 switches::kAppsCheckoutURL, | 952 switches::kAppsCheckoutURL, |
953 switches::kAppsGalleryURL, | 953 switches::kAppsGalleryURL, |
954 switches::kCloudPrintServiceURL, | 954 switches::kCloudPrintServiceURL, |
955 switches::kDebugPrint, | 955 switches::kDebugPrint, |
956 switches::kDisableBundledPpapiFlash, | 956 switches::kDisableBundledPpapiFlash, |
957 switches::kDisableExtensionsResourceWhitelist, | 957 switches::kDisableExtensionsResourceWhitelist, |
958 switches::kDisableScriptedPrintThrottling, | 958 switches::kDisableScriptedPrintThrottling, |
959 switches::kDumpHistogramsOnExit, | 959 switches::kDumpHistogramsOnExit, |
960 switches::kEnableBenchmarking, | 960 switches::kEnableBenchmarking, |
961 switches::kEnableBundledPpapiFlash, | |
962 switches::kEnableCrxlessWebApps, | 961 switches::kEnableCrxlessWebApps, |
963 switches::kEnableExperimentalExtensionApis, | 962 switches::kEnableExperimentalExtensionApis, |
964 switches::kEnableIPCFuzzing, | 963 switches::kEnableIPCFuzzing, |
965 switches::kEnableInteractiveAutocomplete, | 964 switches::kEnableInteractiveAutocomplete, |
966 switches::kEnableNaCl, | 965 switches::kEnableNaCl, |
967 switches::kEnableNaClSRPCProxy, | 966 switches::kEnableNaClSRPCProxy, |
968 switches::kEnablePasswordGeneration, | 967 switches::kEnablePasswordGeneration, |
969 switches::kEnablePnacl, | 968 switches::kEnablePnacl, |
970 switches::kEnableWatchdog, | 969 switches::kEnableWatchdog, |
971 switches::kMemoryProfiling, | 970 switches::kMemoryProfiling, |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1007 switches::kUserDataDir, | 1006 switches::kUserDataDir, |
1008 }; | 1007 }; |
1009 | 1008 |
1010 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1009 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1011 arraysize(kSwitchNames)); | 1010 arraysize(kSwitchNames)); |
1012 } else if (process_type == switches::kZygoteProcess) { | 1011 } else if (process_type == switches::kZygoteProcess) { |
1013 static const char* const kSwitchNames[] = { | 1012 static const char* const kSwitchNames[] = { |
1014 switches::kUserDataDir, // Make logs go to the right file. | 1013 switches::kUserDataDir, // Make logs go to the right file. |
1015 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. | 1014 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. |
1016 switches::kDisableBundledPpapiFlash, | 1015 switches::kDisableBundledPpapiFlash, |
1017 switches::kEnableBundledPpapiFlash, | |
1018 switches::kPpapiFlashInProcess, | 1016 switches::kPpapiFlashInProcess, |
1019 switches::kPpapiFlashPath, | 1017 switches::kPpapiFlashPath, |
1020 switches::kPpapiFlashVersion, | 1018 switches::kPpapiFlashVersion, |
1021 }; | 1019 }; |
1022 | 1020 |
1023 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1021 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
1024 arraysize(kSwitchNames)); | 1022 arraysize(kSwitchNames)); |
1025 } else if (process_type == switches::kGpuProcess) { | 1023 } else if (process_type == switches::kGpuProcess) { |
1026 // If --ignore-gpu-blacklist is passed in, don't send in crash reports | 1024 // If --ignore-gpu-blacklist is passed in, don't send in crash reports |
1027 // because GPU is expected to be unreliable. | 1025 // because GPU is expected to be unreliable. |
(...skipping 901 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1929 io_thread_application_locale_ = locale; | 1927 io_thread_application_locale_ = locale; |
1930 } | 1928 } |
1931 | 1929 |
1932 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1930 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
1933 const std::string& locale) { | 1931 const std::string& locale) { |
1934 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1932 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1935 io_thread_application_locale_ = locale; | 1933 io_thread_application_locale_ = locale; |
1936 } | 1934 } |
1937 | 1935 |
1938 } // namespace chrome | 1936 } // namespace chrome |
OLD | NEW |