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

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

Issue 20593003: Move kEnableExperimentalExtensionApis switch to extensions/common/switches.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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 1416 matching lines...) Expand 10 before | Expand all | Expand 10 after
1427 if (message_center::IsRichNotificationEnabled()) 1427 if (message_center::IsRichNotificationEnabled())
1428 command_line->AppendSwitch(switches::kDisableHTMLNotifications); 1428 command_line->AppendSwitch(switches::kDisableHTMLNotifications);
1429 1429
1430 // Please keep this in alphabetical order. 1430 // Please keep this in alphabetical order.
1431 static const char* const kSwitchNames[] = { 1431 static const char* const kSwitchNames[] = {
1432 autofill::switches::kDisableInteractiveAutocomplete, 1432 autofill::switches::kDisableInteractiveAutocomplete,
1433 autofill::switches::kEnableExperimentalFormFilling, 1433 autofill::switches::kEnableExperimentalFormFilling,
1434 autofill::switches::kEnableInteractiveAutocomplete, 1434 autofill::switches::kEnableInteractiveAutocomplete,
1435 extensions::switches::kAllowLegacyExtensionManifests, 1435 extensions::switches::kAllowLegacyExtensionManifests,
1436 extensions::switches::kAllowScriptingGallery, 1436 extensions::switches::kAllowScriptingGallery,
1437 extensions::switches::kEnableExperimentalExtensionApis,
1437 extensions::switches::kExtensionsOnChromeURLs, 1438 extensions::switches::kExtensionsOnChromeURLs,
1438 switches::kAllowHTTPBackgroundPage, 1439 switches::kAllowHTTPBackgroundPage,
1439 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO 1440 // TODO(victorhsieh): remove the following flag once we move PPAPI FileIO
1440 // to browser. 1441 // to browser.
1441 switches::kAllowNaClFileHandleAPI, 1442 switches::kAllowNaClFileHandleAPI,
1442 switches::kAppsCheckoutURL, 1443 switches::kAppsCheckoutURL,
1443 switches::kAppsGalleryURL, 1444 switches::kAppsGalleryURL,
1444 switches::kCloudPrintServiceURL, 1445 switches::kCloudPrintServiceURL,
1445 switches::kDebugPrint, 1446 switches::kDebugPrint,
1446 switches::kDisableBundledPpapiFlash, 1447 switches::kDisableBundledPpapiFlash,
1447 switches::kDisableExtensionsResourceWhitelist, 1448 switches::kDisableExtensionsResourceWhitelist,
1448 switches::kDisablePnacl, 1449 switches::kDisablePnacl,
1449 switches::kDisableScriptedPrintThrottling, 1450 switches::kDisableScriptedPrintThrottling,
1450 switches::kEnableAdview, 1451 switches::kEnableAdview,
1451 switches::kEnableAdviewSrcAttribute, 1452 switches::kEnableAdviewSrcAttribute,
1452 switches::kEnableAppWindowControls, 1453 switches::kEnableAppWindowControls,
1453 switches::kEnableBenchmarking, 1454 switches::kEnableBenchmarking,
1454 switches::kEnableExperimentalExtensionApis,
1455 switches::kEnableIPCFuzzing, 1455 switches::kEnableIPCFuzzing,
1456 switches::kEnableNaCl, 1456 switches::kEnableNaCl,
1457 switches::kEnableNetBenchmarking, 1457 switches::kEnableNetBenchmarking,
1458 switches::kEnablePasswordGeneration, 1458 switches::kEnablePasswordGeneration,
1459 switches::kEnableWatchdog, 1459 switches::kEnableWatchdog,
1460 switches::kMemoryProfiling, 1460 switches::kMemoryProfiling,
1461 switches::kMessageLoopHistogrammer, 1461 switches::kMessageLoopHistogrammer,
1462 switches::kNoJsRandomness, 1462 switches::kNoJsRandomness,
1463 switches::kPlaybackMode, 1463 switches::kPlaybackMode,
1464 switches::kPpapiFlashArgs, 1464 switches::kPpapiFlashArgs,
1465 switches::kPpapiFlashInProcess, 1465 switches::kPpapiFlashInProcess,
1466 switches::kPpapiFlashPath, 1466 switches::kPpapiFlashPath,
1467 switches::kPpapiFlashVersion, 1467 switches::kPpapiFlashVersion,
1468 switches::kProfilingAtStart, 1468 switches::kProfilingAtStart,
1469 switches::kProfilingFile, 1469 switches::kProfilingFile,
1470 switches::kProfilingFlush, 1470 switches::kProfilingFlush,
1471 switches::kRecordMode, 1471 switches::kRecordMode,
1472 switches::kSilentDumpOnDCHECK, 1472 switches::kSilentDumpOnDCHECK,
1473 switches::kSpdyProxyAuthOrigin, 1473 switches::kSpdyProxyAuthOrigin,
1474 switches::kWhitelistedExtensionID, 1474 switches::kWhitelistedExtensionID,
1475 }; 1475 };
1476 1476
1477 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1477 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1478 arraysize(kSwitchNames)); 1478 arraysize(kSwitchNames));
1479 } else if (process_type == switches::kUtilityProcess) { 1479 } else if (process_type == switches::kUtilityProcess) {
1480 static const char* const kSwitchNames[] = { 1480 static const char* const kSwitchNames[] = {
1481 extensions::switches::kEnableExperimentalExtensionApis,
1481 extensions::switches::kExtensionsOnChromeURLs, 1482 extensions::switches::kExtensionsOnChromeURLs,
1482 switches::kAllowHTTPBackgroundPage, 1483 switches::kAllowHTTPBackgroundPage,
1483 switches::kEnableExperimentalExtensionApis,
1484 switches::kWhitelistedExtensionID, 1484 switches::kWhitelistedExtensionID,
1485 }; 1485 };
1486 1486
1487 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames, 1487 command_line->CopySwitchesFrom(browser_command_line, kSwitchNames,
1488 arraysize(kSwitchNames)); 1488 arraysize(kSwitchNames));
1489 } else if (process_type == switches::kPluginProcess) { 1489 } else if (process_type == switches::kPluginProcess) {
1490 static const char* const kSwitchNames[] = { 1490 static const char* const kSwitchNames[] = {
1491 #if defined(OS_CHROMEOS) 1491 #if defined(OS_CHROMEOS)
1492 chromeos::switches::kLoginProfile, 1492 chromeos::switches::kLoginProfile,
1493 #endif 1493 #endif
(...skipping 1062 matching lines...) Expand 10 before | Expand all | Expand 10 after
2556 #if defined(USE_NSS) 2556 #if defined(USE_NSS)
2557 crypto::CryptoModuleBlockingPasswordDelegate* 2557 crypto::CryptoModuleBlockingPasswordDelegate*
2558 ChromeContentBrowserClient::GetCryptoPasswordDelegate( 2558 ChromeContentBrowserClient::GetCryptoPasswordDelegate(
2559 const GURL& url) { 2559 const GURL& url) {
2560 return chrome::NewCryptoModuleBlockingDialogDelegate( 2560 return chrome::NewCryptoModuleBlockingDialogDelegate(
2561 chrome::kCryptoModulePasswordKeygen, url.host()); 2561 chrome::kCryptoModulePasswordKeygen, url.host());
2562 } 2562 }
2563 #endif 2563 #endif
2564 2564
2565 } // namespace chrome 2565 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698