| 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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 783 switches::kEnableExperimentalExtensionApis, | 783 switches::kEnableExperimentalExtensionApis, |
| 784 switches::kEnableInBrowserThumbnailing, | 784 switches::kEnableInBrowserThumbnailing, |
| 785 switches::kEnableIPCFuzzing, | 785 switches::kEnableIPCFuzzing, |
| 786 switches::kEnableNaCl, | 786 switches::kEnableNaCl, |
| 787 switches::kEnablePasswordGeneration, | 787 switches::kEnablePasswordGeneration, |
| 788 switches::kEnablePlatformApps, | 788 switches::kEnablePlatformApps, |
| 789 switches::kEnableWatchdog, | 789 switches::kEnableWatchdog, |
| 790 switches::kExperimentalSpellcheckerFeatures, | 790 switches::kExperimentalSpellcheckerFeatures, |
| 791 switches::kMemoryProfiling, | 791 switches::kMemoryProfiling, |
| 792 switches::kMessageLoopHistogrammer, | 792 switches::kMessageLoopHistogrammer, |
| 793 switches::kNoJsRandomness, |
| 793 switches::kNoRunningInsecureContent, | 794 switches::kNoRunningInsecureContent, |
| 795 switches::kPlaybackMode, |
| 794 switches::kPpapiFlashArgs, | 796 switches::kPpapiFlashArgs, |
| 795 switches::kPpapiFlashInProcess, | 797 switches::kPpapiFlashInProcess, |
| 796 switches::kPpapiFlashPath, | 798 switches::kPpapiFlashPath, |
| 797 switches::kPpapiFlashVersion, | 799 switches::kPpapiFlashVersion, |
| 798 switches::kProfilingAtStart, | 800 switches::kProfilingAtStart, |
| 799 switches::kProfilingFile, | 801 switches::kProfilingFile, |
| 800 switches::kProfilingFlush, | 802 switches::kProfilingFlush, |
| 803 switches::kRecordMode, |
| 801 switches::kSilentDumpOnDCHECK, | 804 switches::kSilentDumpOnDCHECK, |
| 802 switches::kWhitelistedExtensionID, | 805 switches::kWhitelistedExtensionID, |
| 803 }; | 806 }; |
| 804 | 807 |
| 805 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 808 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
| 806 arraysize(kSwitchNames)); | 809 arraysize(kSwitchNames)); |
| 807 } else if (process_type == switches::kUtilityProcess) { | 810 } else if (process_type == switches::kUtilityProcess) { |
| 808 static const char* const kSwitchNames[] = { | 811 static const char* const kSwitchNames[] = { |
| 809 switches::kEnableExperimentalExtensionApis, | 812 switches::kEnableExperimentalExtensionApis, |
| 810 switches::kEnablePlatformApps, | 813 switches::kEnablePlatformApps, |
| (...skipping 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1645 #if defined(USE_NSS) | 1648 #if defined(USE_NSS) |
| 1646 crypto::CryptoModuleBlockingPasswordDelegate* | 1649 crypto::CryptoModuleBlockingPasswordDelegate* |
| 1647 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1650 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
| 1648 const GURL& url) { | 1651 const GURL& url) { |
| 1649 return browser::NewCryptoModuleBlockingDialogDelegate( | 1652 return browser::NewCryptoModuleBlockingDialogDelegate( |
| 1650 browser::kCryptoModulePasswordKeygen, url.host()); | 1653 browser::kCryptoModulePasswordKeygen, url.host()); |
| 1651 } | 1654 } |
| 1652 #endif | 1655 #endif |
| 1653 | 1656 |
| 1654 } // namespace chrome | 1657 } // namespace chrome |
| OLD | NEW |