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

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

Issue 1314643002: Plugins: Remove Shadow DOM Plugin Placeholder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 #endif 1485 #endif
1486 switches::kEnableBenchmarking, 1486 switches::kEnableBenchmarking,
1487 switches::kEnableNaCl, 1487 switches::kEnableNaCl,
1488 #if !defined(DISABLE_NACL) 1488 #if !defined(DISABLE_NACL)
1489 switches::kEnableNaClDebug, 1489 switches::kEnableNaClDebug,
1490 switches::kEnableNaClNonSfiMode, 1490 switches::kEnableNaClNonSfiMode,
1491 switches::kEnablePNaClSubzero, 1491 switches::kEnablePNaClSubzero,
1492 #endif 1492 #endif
1493 switches::kEnableNetBenchmarking, 1493 switches::kEnableNetBenchmarking,
1494 switches::kEnableNewBookmarkApps, 1494 switches::kEnableNewBookmarkApps,
1495 switches::kEnablePluginPlaceholderShadowDom,
1496 switches::kJavaScriptHarmony, 1495 switches::kJavaScriptHarmony,
1497 switches::kMessageLoopHistogrammer, 1496 switches::kMessageLoopHistogrammer,
1498 switches::kPpapiFlashArgs, 1497 switches::kPpapiFlashArgs,
1499 switches::kPpapiFlashPath, 1498 switches::kPpapiFlashPath,
1500 switches::kPpapiFlashVersion, 1499 switches::kPpapiFlashVersion,
1501 switches::kProfilingAtStart, 1500 switches::kProfilingAtStart,
1502 switches::kProfilingFile, 1501 switches::kProfilingFile,
1503 switches::kProfilingFlush, 1502 switches::kProfilingFlush,
1504 switches::kUnsafelyTreatInsecureOriginAsSecure, 1503 switches::kUnsafelyTreatInsecureOriginAsSecure,
1505 translate::switches::kTranslateSecurityOrigin, 1504 translate::switches::kTranslateSecurityOrigin,
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
2612 switches::kDisableWebRtcEncryption, 2611 switches::kDisableWebRtcEncryption,
2613 }; 2612 };
2614 to_command_line->CopySwitchesFrom(from_command_line, 2613 to_command_line->CopySwitchesFrom(from_command_line,
2615 kWebRtcDevSwitchNames, 2614 kWebRtcDevSwitchNames,
2616 arraysize(kWebRtcDevSwitchNames)); 2615 arraysize(kWebRtcDevSwitchNames));
2617 } 2616 }
2618 } 2617 }
2619 #endif // defined(ENABLE_WEBRTC) 2618 #endif // defined(ENABLE_WEBRTC)
2620 2619
2621 } // namespace chrome 2620 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/chrome_restart_request.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698