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

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: IOS flag name 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
« 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 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 switches::kAllowHTTPBackgroundPage, 1392 switches::kAllowHTTPBackgroundPage,
1393 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1393 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1394 // to browser. 1394 // to browser.
1395 switches::kAllowNaClFileHandleAPI, 1395 switches::kAllowNaClFileHandleAPI,
1396 switches::kAppsCheckoutURL, 1396 switches::kAppsCheckoutURL,
1397 switches::kAppsGalleryURL, 1397 switches::kAppsGalleryURL,
1398 switches::kCloudPrintServiceURL, 1398 switches::kCloudPrintServiceURL,
1399 switches::kDebugPrint, 1399 switches::kDebugPrint,
1400 switches::kDisableBundledPpapiFlash, 1400 switches::kDisableBundledPpapiFlash,
1401 switches::kDisableExtensionsResourceWhitelist, 1401 switches::kDisableExtensionsResourceWhitelist,
1402 switches::kDisablePnacl,
1402 switches::kDisableScriptedPrintThrottling, 1403 switches::kDisableScriptedPrintThrottling,
1403 switches::kEnableAdview, 1404 switches::kEnableAdview,
1404 switches::kEnableAdviewSrcAttribute, 1405 switches::kEnableAdviewSrcAttribute,
1405 switches::kEnableAppWindowControls, 1406 switches::kEnableAppWindowControls,
1406 switches::kEnableBenchmarking, 1407 switches::kEnableBenchmarking,
1407 switches::kEnableExperimentalExtensionApis, 1408 switches::kEnableExperimentalExtensionApis,
1408 switches::kEnableIPCFuzzing, 1409 switches::kEnableIPCFuzzing,
1409 switches::kEnableNaCl, 1410 switches::kEnableNaCl,
1410 switches::kEnableNetBenchmarking, 1411 switches::kEnableNetBenchmarking,
1411 switches::kEnablePasswordGeneration, 1412 switches::kEnablePasswordGeneration,
1412 switches::kEnablePnacl,
1413 switches::kEnableWatchdog, 1413 switches::kEnableWatchdog,
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,
1422 switches::kProfilingAtStart, 1422 switches::kProfilingAtStart,
(...skipping 1037 matching lines...) Expand 10 before | Expand all | Expand 10 after
2460 #if defined(USE_NSS) 2460 #if defined(USE_NSS)
2461 crypto::CryptoModuleBlockingPasswordDelegate* 2461 crypto::CryptoModuleBlockingPasswordDelegate*
2462 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2462 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2463 const GURL& url) { 2463 const GURL& url) {
2464 return chrome::NewCryptoModuleBlockingDialogDelegate( 2464 return chrome::NewCryptoModuleBlockingDialogDelegate(
2465 chrome::kCryptoModulePasswordKeygen, url.host()); 2465 chrome::kCryptoModulePasswordKeygen, url.host());
2466 } 2466 }
2467 #endif 2467 #endif
2468 2468
2469 } // namespace chrome 2469 } // 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