| 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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 651 switches::kMessageLoopHistogrammer, | 651 switches::kMessageLoopHistogrammer, |
| 652 switches::kNoRunningInsecureContent, | 652 switches::kNoRunningInsecureContent, |
| 653 switches::kPpapiFlashArgs, | 653 switches::kPpapiFlashArgs, |
| 654 switches::kPpapiFlashInProcess, | 654 switches::kPpapiFlashInProcess, |
| 655 switches::kPpapiFlashPath, | 655 switches::kPpapiFlashPath, |
| 656 switches::kPpapiFlashVersion, | 656 switches::kPpapiFlashVersion, |
| 657 switches::kProfilingAtStart, | 657 switches::kProfilingAtStart, |
| 658 switches::kProfilingFile, | 658 switches::kProfilingFile, |
| 659 switches::kProfilingFlush, | 659 switches::kProfilingFlush, |
| 660 switches::kSilentDumpOnDCHECK, | 660 switches::kSilentDumpOnDCHECK, |
| 661 switches::kWhitelistedExtensionID, |
| 661 }; | 662 }; |
| 662 | 663 |
| 663 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 664 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 664 arraysize(kSwitchNames)); | 665 arraysize(kSwitchNames)); |
| 665 } else if (process_type == switches::kUtilityProcess) { | 666 } else if (process_type == switches::kUtilityProcess) { |
| 666 if (browser_command_line.HasSwitch( | 667 static const char* const kSwitchNames[] = { |
| 667 switches::kEnableExperimentalExtensionApis)) { | 668 switches::kEnableExperimentalExtensionApis, |
| 668 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 669 switches::kWhitelistedExtensionID, |
| 669 } | 670 }; |
| 671 |
| 672 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 673 arraysize(kSwitchNames)); |
| 670 } else if (process_type == switches::kPluginProcess) { | 674 } else if (process_type == switches::kPluginProcess) { |
| 671 static const char* const kSwitchNames[] = { | 675 static const char* const kSwitchNames[] = { |
| 672 #if defined(OS_CHROMEOS) | 676 #if defined(OS_CHROMEOS) |
| 673 switches::kLoginProfile, | 677 switches::kLoginProfile, |
| 674 #endif | 678 #endif |
| 675 switches::kMemoryProfiling, | 679 switches::kMemoryProfiling, |
| 676 switches::kSilentDumpOnDCHECK, | 680 switches::kSilentDumpOnDCHECK, |
| 677 switches::kUserDataDir, | 681 switches::kUserDataDir, |
| 678 }; | 682 }; |
| 679 | 683 |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1329 #if defined(USE_NSS) | 1333 #if defined(USE_NSS) |
| 1330 crypto::CryptoModuleBlockingPasswordDelegate* | 1334 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1331 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1335 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1332 const GURL& url) { | 1336 const GURL& url) { |
| 1333 return browser::NewCryptoModuleBlockingDialogDelegate( | 1337 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 1334 browser::kCryptoModulePasswordKeygen, url.host()); | 1338 browser::kCryptoModulePasswordKeygen, url.host()); |
| 1335 } | 1339 } |
| 1336 #endif | 1340 #endif |
| 1337 | 1341 |
| 1338 } // namespace chrome | 1342 } // namespace chrome |
| OLD | NEW |