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 628 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
639 // Please keep this in alphabetical order. | 639 // Please keep this in alphabetical order. |
640 static const char* const kSwitchNames[] = { | 640 static const char* const kSwitchNames[] = { |
641 switches::kAllowHTTPBackgroundPage, | 641 switches::kAllowHTTPBackgroundPage, |
642 switches::kAllowLegacyExtensionManifests, | 642 switches::kAllowLegacyExtensionManifests, |
643 switches::kAllowNaClSocketAPI, | 643 switches::kAllowNaClSocketAPI, |
644 switches::kAllowScriptingGallery, | 644 switches::kAllowScriptingGallery, |
645 switches::kAppsCheckoutURL, | 645 switches::kAppsCheckoutURL, |
646 switches::kAppsGalleryURL, | 646 switches::kAppsGalleryURL, |
647 switches::kCloudPrintServiceURL, | 647 switches::kCloudPrintServiceURL, |
648 switches::kDebugPrint, | 648 switches::kDebugPrint, |
| 649 switches::kDefaultDeviceScaleFactor, |
649 switches::kDumpHistogramsOnExit, | 650 switches::kDumpHistogramsOnExit, |
650 switches::kEnableBenchmarking, | 651 switches::kEnableBenchmarking, |
651 switches::kEnableCrxlessWebApps, | 652 switches::kEnableCrxlessWebApps, |
652 switches::kEnableExperimentalExtensionApis, | 653 switches::kEnableExperimentalExtensionApis, |
| 654 switches::kEnableFixedLayout, |
653 switches::kEnableInBrowserThumbnailing, | 655 switches::kEnableInBrowserThumbnailing, |
654 switches::kEnableIPCFuzzing, | 656 switches::kEnableIPCFuzzing, |
655 switches::kEnableNaCl, | 657 switches::kEnableNaCl, |
656 switches::kEnablePlatformApps, | 658 switches::kEnablePlatformApps, |
657 switches::kEnableWatchdog, | 659 switches::kEnableWatchdog, |
658 switches::kExperimentalSpellcheckerFeatures, | 660 switches::kExperimentalSpellcheckerFeatures, |
659 switches::kMemoryProfiling, | 661 switches::kMemoryProfiling, |
660 switches::kMessageLoopHistogrammer, | 662 switches::kMessageLoopHistogrammer, |
661 switches::kNoRunningInsecureContent, | 663 switches::kNoRunningInsecureContent, |
662 switches::kPpapiFlashArgs, | 664 switches::kPpapiFlashArgs, |
(...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1341 #if defined(USE_NSS) | 1343 #if defined(USE_NSS) |
1342 crypto::CryptoModuleBlockingPasswordDelegate* | 1344 crypto::CryptoModuleBlockingPasswordDelegate* |
1343 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 1345 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
1344 const GURL& url) { | 1346 const GURL& url) { |
1345 return browser::NewCryptoModuleBlockingDialogDelegate( | 1347 return browser::NewCryptoModuleBlockingDialogDelegate( |
1346 browser::kCryptoModulePasswordKeygen, url.host()); | 1348 browser::kCryptoModulePasswordKeygen, url.host()); |
1347 } | 1349 } |
1348 #endif | 1350 #endif |
1349 | 1351 |
1350 } // namespace chrome | 1352 } // namespace chrome |
OLD | NEW |