| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/app/breakpad_mac.h" | 8 #include "chrome/app/breakpad_mac.h" |
| 9 #include "chrome/browser/browser_about_handler.h" | 9 #include "chrome/browser/browser_about_handler.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 333 switches::kEnablePrintPreview, | 333 switches::kEnablePrintPreview, |
| 334 #endif | 334 #endif |
| 335 switches::kDomAutomationController, | 335 switches::kDomAutomationController, |
| 336 switches::kDumpHistogramsOnExit, | 336 switches::kDumpHistogramsOnExit, |
| 337 switches::kEnableClickToPlay, | 337 switches::kEnableClickToPlay, |
| 338 switches::kEnableCrxlessWebApps, | 338 switches::kEnableCrxlessWebApps, |
| 339 switches::kEnableExperimentalExtensionApis, | 339 switches::kEnableExperimentalExtensionApis, |
| 340 switches::kEnableInBrowserThumbnailing, | 340 switches::kEnableInBrowserThumbnailing, |
| 341 switches::kEnableIPCFuzzing, | 341 switches::kEnableIPCFuzzing, |
| 342 switches::kEnableNaCl, | 342 switches::kEnableNaCl, |
| 343 switches::kEnableRemoting, | |
| 344 switches::kEnableResourceContentSettings, | 343 switches::kEnableResourceContentSettings, |
| 345 switches::kEnableSearchProviderApiV2, | 344 switches::kEnableSearchProviderApiV2, |
| 346 switches::kEnableWatchdog, | 345 switches::kEnableWatchdog, |
| 347 switches::kExperimentalSpellcheckerFeatures, | 346 switches::kExperimentalSpellcheckerFeatures, |
| 348 switches::kMemoryProfiling, | 347 switches::kMemoryProfiling, |
| 349 switches::kMessageLoopHistogrammer, | 348 switches::kMessageLoopHistogrammer, |
| 350 switches::kPpapiFlashArgs, | 349 switches::kPpapiFlashArgs, |
| 351 switches::kPpapiFlashInProcess, | 350 switches::kPpapiFlashInProcess, |
| 352 switches::kPpapiFlashPath, | 351 switches::kPpapiFlashPath, |
| 353 switches::kPpapiFlashVersion, | 352 switches::kPpapiFlashVersion, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 371 #endif | 370 #endif |
| 372 switches::kMemoryProfiling, | 371 switches::kMemoryProfiling, |
| 373 switches::kSilentDumpOnDCHECK, | 372 switches::kSilentDumpOnDCHECK, |
| 374 switches::kUserDataDir, | 373 switches::kUserDataDir, |
| 375 }; | 374 }; |
| 376 | 375 |
| 377 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 376 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 378 arraysize(kSwitchNames)); | 377 arraysize(kSwitchNames)); |
| 379 } else if (process_type == switches::kZygoteProcess) { | 378 } else if (process_type == switches::kZygoteProcess) { |
| 380 static const char* const kSwitchNames[] = { | 379 static const char* const kSwitchNames[] = { |
| 381 switches::kEnableRemoting, | |
| 382 switches::kUserDataDir, // Make logs go to the right file. | 380 switches::kUserDataDir, // Make logs go to the right file. |
| 383 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. | 381 // Load (in-process) Pepper plugins in-process in the zygote pre-sandbox. |
| 384 switches::kPpapiFlashInProcess, | 382 switches::kPpapiFlashInProcess, |
| 385 switches::kPpapiFlashPath, | 383 switches::kPpapiFlashPath, |
| 386 switches::kPpapiFlashVersion, | 384 switches::kPpapiFlashVersion, |
| 387 }; | 385 }; |
| 388 | 386 |
| 389 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 387 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 390 arraysize(kSwitchNames)); | 388 arraysize(kSwitchNames)); |
| 391 } | 389 } |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 787 #if defined(USE_NSS) | 785 #if defined(USE_NSS) |
| 788 crypto::CryptoModuleBlockingPasswordDelegate* | 786 crypto::CryptoModuleBlockingPasswordDelegate* |
| 789 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 787 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 790 const GURL& url) { | 788 const GURL& url) { |
| 791 return browser::NewCryptoModuleBlockingDialogDelegate( | 789 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 792 browser::kCryptoModulePasswordKeygen, url.host()); | 790 browser::kCryptoModulePasswordKeygen, url.host()); |
| 793 } | 791 } |
| 794 #endif | 792 #endif |
| 795 | 793 |
| 796 } // namespace chrome | 794 } // namespace chrome |
| OLD | NEW |