chrome/browser/chrome_content_browser_client.cc - Issue 19079002: Enable pnacl by default

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

Issue 19079002: Enable pnacl by default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 5 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

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 1380 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1391 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO	1391 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO

1392 // to browser.	1392 // to browser.

1393 switches::kAllowNaClFileHandleAPI,	1393 switches::kAllowNaClFileHandleAPI,

1394 switches::kAllowScriptingGallery,	1394 switches::kAllowScriptingGallery,

1395 switches::kAppsCheckoutURL,	1395 switches::kAppsCheckoutURL,

1396 switches::kAppsGalleryURL,	1396 switches::kAppsGalleryURL,

1397 switches::kCloudPrintServiceURL,	1397 switches::kCloudPrintServiceURL,

1398 switches::kDebugPrint,	1398 switches::kDebugPrint,

1399 switches::kDisableBundledPpapiFlash,	1399 switches::kDisableBundledPpapiFlash,

1400 switches::kDisableExtensionsResourceWhitelist,	1400 switches::kDisableExtensionsResourceWhitelist,

	1401 switches::kDisablePnacl,

1401 switches::kDisableScriptedPrintThrottling,	1402 switches::kDisableScriptedPrintThrottling,

1402 switches::kEnableAdview,	1403 switches::kEnableAdview,

1403 switches::kEnableAdviewSrcAttribute,	1404 switches::kEnableAdviewSrcAttribute,

1404 switches::kEnableAppWindowControls,	1405 switches::kEnableAppWindowControls,

1405 switches::kEnableBenchmarking,	1406 switches::kEnableBenchmarking,

1406 switches::kEnableExperimentalExtensionApis,	1407 switches::kEnableExperimentalExtensionApis,

1407 switches::kEnableIPCFuzzing,	1408 switches::kEnableIPCFuzzing,

1408 switches::kEnableNaCl,	1409 switches::kEnableNaCl,

1409 switches::kEnableNetBenchmarking,	1410 switches::kEnableNetBenchmarking,

1410 switches::kEnablePasswordGeneration,	1411 switches::kEnablePasswordGeneration,

1411 switches::kEnablePnacl,

1412 switches::kEnableWatchdog,	1412 switches::kEnableWatchdog,

1413 switches::kExtensionsOnChromeURLs,	1413 switches::kExtensionsOnChromeURLs,

1414 switches::kMemoryProfiling,	1414 switches::kMemoryProfiling,

1415 switches::kMessageLoopHistogrammer,	1415 switches::kMessageLoopHistogrammer,

1416 switches::kNoJsRandomness,	1416 switches::kNoJsRandomness,

1417 switches::kPlaybackMode,	1417 switches::kPlaybackMode,

1418 switches::kPpapiFlashArgs,	1418 switches::kPpapiFlashArgs,

1419 switches::kPpapiFlashInProcess,	1419 switches::kPpapiFlashInProcess,

1420 switches::kPpapiFlashPath,	1420 switches::kPpapiFlashPath,

1421 switches::kPpapiFlashVersion,	1421 switches::kPpapiFlashVersion,

(...skipping 1040 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
2462 #if defined(USE_NSS)	2462 #if defined(USE_NSS)

2463 crypto::CryptoModuleBlockingPasswordDelegate*	2463 crypto::CryptoModuleBlockingPasswordDelegate*

2464 ChromeContentBrowserClient::GetCryptoPasswordDelegate(	2464 ChromeContentBrowserClient::GetCryptoPasswordDelegate(

2465 const GURL& url) {	2465 const GURL& url) {

2466 return chrome::NewCryptoModuleBlockingDialogDelegate(	2466 return chrome::NewCryptoModuleBlockingDialogDelegate(

2467 chrome::kCryptoModulePasswordKeygen, url.host());	2467 chrome::kCryptoModulePasswordKeygen, url.host());

2468 }	2468 }

2469 #endif	2469 #endif

2470	2470

2471 } // namespace chrome	2471 } // namespace chrome

OLD	NEW

« chrome/app/generated_resources.grd ('K') | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/webui/nacl_ui.cc » ('j') | chrome/browser/ui/webui/nacl_ui.cc » ('J')