| 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 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1134 switches::kEnableCrxlessWebApps, | 1134 switches::kEnableCrxlessWebApps, |
| 1135 switches::kEnableExperimentalExtensionApis, | 1135 switches::kEnableExperimentalExtensionApis, |
| 1136 switches::kEnableExperimentalFormFilling, | 1136 switches::kEnableExperimentalFormFilling, |
| 1137 switches::kEnableIPCFuzzing, | 1137 switches::kEnableIPCFuzzing, |
| 1138 switches::kEnableInteractiveAutocomplete, | 1138 switches::kEnableInteractiveAutocomplete, |
| 1139 switches::kEnableNaCl, | 1139 switches::kEnableNaCl, |
| 1140 switches::kEnableNetBenchmarking, | 1140 switches::kEnableNetBenchmarking, |
| 1141 switches::kEnablePasswordGeneration, | 1141 switches::kEnablePasswordGeneration, |
| 1142 switches::kEnablePnacl, | 1142 switches::kEnablePnacl, |
| 1143 switches::kEnableWatchdog, | 1143 switches::kEnableWatchdog, |
| 1144 switches::kExtensionsOnChromeURLs, |
| 1144 switches::kMemoryProfiling, | 1145 switches::kMemoryProfiling, |
| 1145 switches::kMessageLoopHistogrammer, | 1146 switches::kMessageLoopHistogrammer, |
| 1146 switches::kNoJsRandomness, | 1147 switches::kNoJsRandomness, |
| 1147 switches::kPerformCrashAnalysis, | 1148 switches::kPerformCrashAnalysis, |
| 1148 switches::kPlaybackMode, | 1149 switches::kPlaybackMode, |
| 1149 switches::kPpapiFlashArgs, | 1150 switches::kPpapiFlashArgs, |
| 1150 switches::kPpapiFlashInProcess, | 1151 switches::kPpapiFlashInProcess, |
| 1151 switches::kPpapiFlashPath, | 1152 switches::kPpapiFlashPath, |
| 1152 switches::kPpapiFlashVersion, | 1153 switches::kPpapiFlashVersion, |
| 1153 switches::kProfilingAtStart, | 1154 switches::kProfilingAtStart, |
| 1154 switches::kProfilingFile, | 1155 switches::kProfilingFile, |
| 1155 switches::kProfilingFlush, | 1156 switches::kProfilingFlush, |
| 1156 switches::kRecordMode, | 1157 switches::kRecordMode, |
| 1157 switches::kSilentDumpOnDCHECK, | 1158 switches::kSilentDumpOnDCHECK, |
| 1158 switches::kSpdyProxyAuthOrigin, | 1159 switches::kSpdyProxyAuthOrigin, |
| 1159 switches::kWhitelistedExtensionID, | 1160 switches::kWhitelistedExtensionID, |
| 1160 }; | 1161 }; |
| 1161 | 1162 |
| 1162 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1163 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 1163 arraysize(kSwitchNames)); | 1164 arraysize(kSwitchNames)); |
| 1164 } else if (process_type == switches::kUtilityProcess) { | 1165 } else if (process_type == switches::kUtilityProcess) { |
| 1165 static const char* const kSwitchNames[] = { | 1166 static const char* const kSwitchNames[] = { |
| 1166 switches::kAllowHTTPBackgroundPage, | 1167 switches::kAllowHTTPBackgroundPage, |
| 1167 switches::kEnableExperimentalExtensionApis, | 1168 switches::kEnableExperimentalExtensionApis, |
| 1169 switches::kExtensionsOnChromeURLs, |
| 1168 switches::kWhitelistedExtensionID, | 1170 switches::kWhitelistedExtensionID, |
| 1169 }; | 1171 }; |
| 1170 | 1172 |
| 1171 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1173 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 1172 arraysize(kSwitchNames)); | 1174 arraysize(kSwitchNames)); |
| 1173 } else if (process_type == switches::kPluginProcess) { | 1175 } else if (process_type == switches::kPluginProcess) { |
| 1174 static const char* const kSwitchNames[] = { | 1176 static const char* const kSwitchNames[] = { |
| 1175 #if defined(OS_CHROMEOS) | 1177 #if defined(OS_CHROMEOS) |
| 1176 switches::kLoginProfile, | 1178 switches::kLoginProfile, |
| 1177 #endif | 1179 #endif |
| 1178 switches::kMemoryProfiling, | 1180 switches::kMemoryProfiling, |
| 1179 switches::kSilentDumpOnDCHECK, | 1181 switches::kSilentDumpOnDCHECK, |
| 1180 switches::kUserDataDir, | 1182 switches::kUserDataDir, |
| 1181 }; | 1183 }; |
| 1182 | 1184 |
| 1183 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1185 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 1184 arraysize(kSwitchNames)); | 1186 arraysize(kSwitchNames)); |
| 1185 } else if (process_type == switches::kZygoteProcess) { | 1187 } else if (process_type == switches::kZygoteProcess) { |
| 1186 static const char* const kSwitchNames[] = { | 1188 static const char* const kSwitchNames[] = { |
| 1187 switches::kUserDataDir, // Make logs go to the right file. | 1189 switches::kUserDataDir, // Make logs go to the right file. |
| 1188 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. | 1190 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. |
| 1189 switches::kDisableBundledPpapiFlash, | 1191 switches::kDisableBundledPpapiFlash, |
| 1192 switches::kExtensionsOnChromeURLs, |
| 1190 switches::kPpapiFlashInProcess, | 1193 switches::kPpapiFlashInProcess, |
| 1191 switches::kPpapiFlashPath, | 1194 switches::kPpapiFlashPath, |
| 1192 switches::kPpapiFlashVersion, | 1195 switches::kPpapiFlashVersion, |
| 1193 }; | 1196 }; |
| 1194 | 1197 |
| 1195 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 1198 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 1196 arraysize(kSwitchNames)); | 1199 arraysize(kSwitchNames)); |
| 1197 } else if (process_type == switches::kGpuProcess) { | 1200 } else if (process_type == switches::kGpuProcess) { |
| 1198 base::FilePath user_data_dir = | 1201 base::FilePath user_data_dir = |
| 1199 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); | 1202 browser_command_line.GetSwitchValuePath(switches::kUserDataDir); |
| (...skipping 896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2096 io_thread_application_locale_ = locale; | 2099 io_thread_application_locale_ = locale; |
| 2097 } | 2100 } |
| 2098 | 2101 |
| 2099 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 2102 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
| 2100 const std::string& locale) { | 2103 const std::string& locale) { |
| 2101 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 2104 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 2102 io_thread_application_locale_ = locale; | 2105 io_thread_application_locale_ = locale; |
| 2103 } | 2106 } |
| 2104 | 2107 |
| 2105 } // namespace chrome | 2108 } // namespace chrome |
| OLD | NEW |