Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(406)

Side by Side Diff: chrome/browser/chrome_content_browser_client.cc

Issue 22839005: disable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove some unintended revert changes Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 1429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1440 switches::kAllowHTTPBackgroundPage, 1440 switches::kAllowHTTPBackgroundPage,
1441 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1441 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1442 // to browser. 1442 // to browser.
1443 switches::kAllowNaClFileHandleAPI, 1443 switches::kAllowNaClFileHandleAPI,
1444 switches::kAppsCheckoutURL, 1444 switches::kAppsCheckoutURL,
1445 switches::kAppsGalleryURL, 1445 switches::kAppsGalleryURL,
1446 switches::kCloudPrintServiceURL, 1446 switches::kCloudPrintServiceURL,
1447 switches::kDebugPrint, 1447 switches::kDebugPrint,
1448 switches::kDisableBundledPpapiFlash, 1448 switches::kDisableBundledPpapiFlash,
1449 switches::kDisableExtensionsResourceWhitelist, 1449 switches::kDisableExtensionsResourceWhitelist,
1450 switches::kDisablePnacl,
1451 switches::kDisableScriptedPrintThrottling, 1450 switches::kDisableScriptedPrintThrottling,
1452 switches::kEnableAdview, 1451 switches::kEnableAdview,
1453 switches::kEnableAdviewSrcAttribute, 1452 switches::kEnableAdviewSrcAttribute,
1454 switches::kEnableAppWindowControls, 1453 switches::kEnableAppWindowControls,
1455 switches::kEnableBenchmarking, 1454 switches::kEnableBenchmarking,
1456 switches::kEnableIPCFuzzing, 1455 switches::kEnableIPCFuzzing,
1457 switches::kEnableNaCl, 1456 switches::kEnableNaCl,
1458 switches::kEnableNetBenchmarking, 1457 switches::kEnableNetBenchmarking,
1459 switches::kEnablePasswordGeneration, 1458 switches::kEnablePasswordGeneration,
1459 switches::kEnablePnacl,
1460 switches::kEnableWatchdog, 1460 switches::kEnableWatchdog,
1461 switches::kMemoryProfiling, 1461 switches::kMemoryProfiling,
1462 switches::kMessageLoopHistogrammer, 1462 switches::kMessageLoopHistogrammer,
1463 switches::kNoJsRandomness, 1463 switches::kNoJsRandomness,
1464 switches::kPlaybackMode, 1464 switches::kPlaybackMode,
1465 switches::kPpapiFlashArgs, 1465 switches::kPpapiFlashArgs,
1466 switches::kPpapiFlashInProcess, 1466 switches::kPpapiFlashInProcess,
1467 switches::kPpapiFlashPath, 1467 switches::kPpapiFlashPath,
1468 switches::kPpapiFlashVersion, 1468 switches::kPpapiFlashVersion,
1469 switches::kProfilingAtStart, 1469 switches::kProfilingAtStart,
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
2552 #if defined(USE_NSS) 2552 #if defined(USE_NSS)
2553 crypto::CryptoModuleBlockingPasswordDelegate* 2553 crypto::CryptoModuleBlockingPasswordDelegate*
2554 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2554 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2555 const GURL& url) { 2555 const GURL& url) {
2556 return chrome::NewCryptoModuleBlockingDialogDelegate( 2556 return chrome::NewCryptoModuleBlockingDialogDelegate(
2557 chrome::kCryptoModulePasswordKeygen, url.host()); 2557 chrome::kCryptoModulePasswordKeygen, url.host());
2558 } 2558 }
2559 #endif 2559 #endif
2560 2560
2561 } // namespace chrome 2561 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698