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

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

Issue 649873006: Enable shadow DOM-based "missing plugin" placeholder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: test for allowed plugin Created 6 years, 1 month 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 1347 matching lines...) Expand 10 before | Expand all | Expand 10 after
1358 switches::kCloudPrintURL, 1358 switches::kCloudPrintURL,
1359 switches::kCloudPrintXmppEndpoint, 1359 switches::kCloudPrintXmppEndpoint,
1360 switches::kDisableBundledPpapiFlash, 1360 switches::kDisableBundledPpapiFlash,
1361 switches::kEnableBenchmarking, 1361 switches::kEnableBenchmarking,
1362 switches::kEnableNaCl, 1362 switches::kEnableNaCl,
1363 #if !defined(DISABLE_NACL) 1363 #if !defined(DISABLE_NACL)
1364 switches::kEnableNaClDebug, 1364 switches::kEnableNaClDebug,
1365 switches::kEnableNaClNonSfiMode, 1365 switches::kEnableNaClNonSfiMode,
1366 #endif 1366 #endif
1367 switches::kEnableNetBenchmarking, 1367 switches::kEnableNetBenchmarking,
1368 switches::kEnablePluginPlaceholderShadowDom,
1368 switches::kEnableShowModalDialog, 1369 switches::kEnableShowModalDialog,
1369 switches::kEnableStreamlinedHostedApps, 1370 switches::kEnableStreamlinedHostedApps,
1370 switches::kEnableWebBasedSignin, 1371 switches::kEnableWebBasedSignin,
1371 switches::kJavaScriptHarmony, 1372 switches::kJavaScriptHarmony,
1372 switches::kMessageLoopHistogrammer, 1373 switches::kMessageLoopHistogrammer,
1373 switches::kOutOfProcessPdf, 1374 switches::kOutOfProcessPdf,
1374 switches::kPlaybackMode, 1375 switches::kPlaybackMode,
1375 switches::kPpapiFlashArgs, 1376 switches::kPpapiFlashArgs,
1376 switches::kPpapiFlashPath, 1377 switches::kPpapiFlashPath,
1377 switches::kPpapiFlashVersion, 1378 switches::kPpapiFlashVersion,
(...skipping 1271 matching lines...) Expand 10 before | Expand all | Expand 10 after
2649 switches::kDisableWebRtcEncryption, 2650 switches::kDisableWebRtcEncryption,
2650 }; 2651 };
2651 to_command_line->CopySwitchesFrom(from_command_line, 2652 to_command_line->CopySwitchesFrom(from_command_line,
2652 kWebRtcDevSwitchNames, 2653 kWebRtcDevSwitchNames,
2653 arraysize(kWebRtcDevSwitchNames)); 2654 arraysize(kWebRtcDevSwitchNames));
2654 } 2655 }
2655 } 2656 }
2656 #endif // defined(ENABLE_WEBRTC) 2657 #endif // defined(ENABLE_WEBRTC)
2657 2658
2658 } // namespace chrome 2659 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698