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

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

Issue 23326003: Enable PNaCl by default (revert disabling CL) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixes for Jan's comments. 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 switches::kAllowHTTPBackgroundPage, 1424 switches::kAllowHTTPBackgroundPage,
1425 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1425 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1426 // to browser. 1426 // to browser.
1427 switches::kAllowNaClFileHandleAPI, 1427 switches::kAllowNaClFileHandleAPI,
1428 switches::kAppsCheckoutURL, 1428 switches::kAppsCheckoutURL,
1429 switches::kAppsGalleryURL, 1429 switches::kAppsGalleryURL,
1430 switches::kCloudPrintServiceURL, 1430 switches::kCloudPrintServiceURL,
1431 switches::kDebugPrint, 1431 switches::kDebugPrint,
1432 switches::kDisableBundledPpapiFlash, 1432 switches::kDisableBundledPpapiFlash,
1433 switches::kDisableExtensionsResourceWhitelist, 1433 switches::kDisableExtensionsResourceWhitelist,
1434 switches::kDisablePnacl,
1434 switches::kDisableScriptedPrintThrottling, 1435 switches::kDisableScriptedPrintThrottling,
1435 switches::kEnableAdview, 1436 switches::kEnableAdview,
1436 switches::kEnableAdviewSrcAttribute, 1437 switches::kEnableAdviewSrcAttribute,
1437 switches::kEnableAppWindowControls, 1438 switches::kEnableAppWindowControls,
1438 switches::kEnableBenchmarking, 1439 switches::kEnableBenchmarking,
1439 switches::kEnableIPCFuzzing, 1440 switches::kEnableIPCFuzzing,
1440 switches::kEnableNaCl, 1441 switches::kEnableNaCl,
1441 switches::kEnableNetBenchmarking, 1442 switches::kEnableNetBenchmarking,
1442 switches::kEnablePasswordGeneration, 1443 switches::kEnablePasswordGeneration,
1443 switches::kEnablePnacl,
1444 switches::kEnableWatchdog, 1444 switches::kEnableWatchdog,
1445 switches::kMemoryProfiling, 1445 switches::kMemoryProfiling,
1446 switches::kMessageLoopHistogrammer, 1446 switches::kMessageLoopHistogrammer,
1447 switches::kNoJsRandomness, 1447 switches::kNoJsRandomness,
1448 switches::kPlaybackMode, 1448 switches::kPlaybackMode,
1449 switches::kPpapiFlashArgs, 1449 switches::kPpapiFlashArgs,
1450 switches::kPpapiFlashInProcess, 1450 switches::kPpapiFlashInProcess,
1451 switches::kPpapiFlashPath, 1451 switches::kPpapiFlashPath,
1452 switches::kPpapiFlashVersion, 1452 switches::kPpapiFlashVersion,
1453 switches::kProfilingAtStart, 1453 switches::kProfilingAtStart,
(...skipping 1085 matching lines...) Expand 10 before | Expand all | Expand 10 after
2539 #if defined(USE_NSS) 2539 #if defined(USE_NSS)
2540 crypto::CryptoModuleBlockingPasswordDelegate* 2540 crypto::CryptoModuleBlockingPasswordDelegate*
2541 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2541 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2542 const GURL& url) { 2542 const GURL& url) {
2543 return chrome::NewCryptoModuleBlockingDialogDelegate( 2543 return chrome::NewCryptoModuleBlockingDialogDelegate(
2544 chrome::kCryptoModulePasswordKeygen, url.host()); 2544 chrome::kCryptoModulePasswordKeygen, url.host());
2545 } 2545 }
2546 #endif 2546 #endif
2547 2547
2548 } // namespace chrome 2548 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698