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

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

Issue 756653005: Change the flag which enables OOP PDF to an enable/disable flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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
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 1348 matching lines...) Expand 10 before | Expand all | Expand 10 after
1359 extensions::switches::kEnableScriptsRequireAction, 1359 extensions::switches::kEnableScriptsRequireAction,
1360 extensions::switches::kExtensionsOnChromeURLs, 1360 extensions::switches::kExtensionsOnChromeURLs,
1361 extensions::switches::kWhitelistedExtensionID, 1361 extensions::switches::kWhitelistedExtensionID,
1362 #endif 1362 #endif
1363 switches::kAppsCheckoutURL, 1363 switches::kAppsCheckoutURL,
1364 switches::kAppsGalleryURL, 1364 switches::kAppsGalleryURL,
1365 switches::kCloudPrintURL, 1365 switches::kCloudPrintURL,
1366 switches::kCloudPrintXmppEndpoint, 1366 switches::kCloudPrintXmppEndpoint,
1367 switches::kDisableBundledPpapiFlash, 1367 switches::kDisableBundledPpapiFlash,
1368 switches::kDisableCastStreamingHWEncoding, 1368 switches::kDisableCastStreamingHWEncoding,
1369 switches::kDisableOutOfProcessPdf,
1369 switches::kEnableBenchmarking, 1370 switches::kEnableBenchmarking,
1370 switches::kEnableNaCl, 1371 switches::kEnableNaCl,
1371 #if !defined(DISABLE_NACL) 1372 #if !defined(DISABLE_NACL)
1372 switches::kEnableNaClDebug, 1373 switches::kEnableNaClDebug,
1373 switches::kEnableNaClNonSfiMode, 1374 switches::kEnableNaClNonSfiMode,
1374 #endif 1375 #endif
1375 switches::kEnableNetBenchmarking, 1376 switches::kEnableNetBenchmarking,
1377 switches::kEnableOutOfProcessPdf,
1376 switches::kEnablePluginPlaceholderShadowDom, 1378 switches::kEnablePluginPlaceholderShadowDom,
1377 switches::kEnableShowModalDialog, 1379 switches::kEnableShowModalDialog,
1378 switches::kEnableStreamlinedHostedApps, 1380 switches::kEnableStreamlinedHostedApps,
1379 switches::kEnableWebBasedSignin, 1381 switches::kEnableWebBasedSignin,
1380 switches::kJavaScriptHarmony, 1382 switches::kJavaScriptHarmony,
1381 switches::kMessageLoopHistogrammer, 1383 switches::kMessageLoopHistogrammer,
1382 switches::kOutOfProcessPdf,
1383 switches::kPlaybackMode, 1384 switches::kPlaybackMode,
1384 switches::kPpapiFlashArgs, 1385 switches::kPpapiFlashArgs,
1385 switches::kPpapiFlashPath, 1386 switches::kPpapiFlashPath,
1386 switches::kPpapiFlashVersion, 1387 switches::kPpapiFlashVersion,
1387 switches::kProfilingAtStart, 1388 switches::kProfilingAtStart,
1388 switches::kProfilingFile, 1389 switches::kProfilingFile,
1389 switches::kProfilingFlush, 1390 switches::kProfilingFlush,
1390 switches::kRecordMode, 1391 switches::kRecordMode,
1391 translate::switches::kTranslateSecurityOrigin, 1392 translate::switches::kTranslateSecurityOrigin,
1392 }; 1393 };
(...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after
2673 switches::kDisableWebRtcEncryption, 2674 switches::kDisableWebRtcEncryption,
2674 }; 2675 };
2675 to_command_line->CopySwitchesFrom(from_command_line, 2676 to_command_line->CopySwitchesFrom(from_command_line,
2676 kWebRtcDevSwitchNames, 2677 kWebRtcDevSwitchNames,
2677 arraysize(kWebRtcDevSwitchNames)); 2678 arraysize(kWebRtcDevSwitchNames));
2678 } 2679 }
2679 } 2680 }
2680 #endif // defined(ENABLE_WEBRTC) 2681 #endif // defined(ENABLE_WEBRTC)
2681 2682
2682 } // namespace chrome 2683 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_win.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698