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

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

Issue 589093003: Revert of Let --js-flags work when Harmony is enabled in about:flags (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.h » ('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 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after
1346 switches::kEnableBenchmarking, 1346 switches::kEnableBenchmarking,
1347 switches::kEnableNaCl, 1347 switches::kEnableNaCl,
1348 #if !defined(DISABLE_NACL) 1348 #if !defined(DISABLE_NACL)
1349 switches::kEnableNaClDebug, 1349 switches::kEnableNaClDebug,
1350 switches::kEnableNaClNonSfiMode, 1350 switches::kEnableNaClNonSfiMode,
1351 #endif 1351 #endif
1352 switches::kEnableNetBenchmarking, 1352 switches::kEnableNetBenchmarking,
1353 switches::kEnableShowModalDialog, 1353 switches::kEnableShowModalDialog,
1354 switches::kEnableStreamlinedHostedApps, 1354 switches::kEnableStreamlinedHostedApps,
1355 switches::kEnableWebBasedSignin, 1355 switches::kEnableWebBasedSignin,
1356 switches::kJavaScriptHarmony,
1357 switches::kMessageLoopHistogrammer, 1356 switches::kMessageLoopHistogrammer,
1358 switches::kOutOfProcessPdf, 1357 switches::kOutOfProcessPdf,
1359 switches::kPlaybackMode, 1358 switches::kPlaybackMode,
1360 switches::kPpapiFlashArgs, 1359 switches::kPpapiFlashArgs,
1361 switches::kPpapiFlashPath, 1360 switches::kPpapiFlashPath,
1362 switches::kPpapiFlashVersion, 1361 switches::kPpapiFlashVersion,
1363 switches::kProfilingAtStart, 1362 switches::kProfilingAtStart,
1364 switches::kProfilingFile, 1363 switches::kProfilingFile,
1365 switches::kProfilingFlush, 1364 switches::kProfilingFlush,
1366 switches::kRecordMode, 1365 switches::kRecordMode,
(...skipping 1225 matching lines...) Expand 10 before | Expand all | Expand 10 after
2592 switches::kDisableWebRtcEncryption, 2591 switches::kDisableWebRtcEncryption,
2593 }; 2592 };
2594 to_command_line->CopySwitchesFrom(from_command_line, 2593 to_command_line->CopySwitchesFrom(from_command_line,
2595 kWebRtcDevSwitchNames, 2594 kWebRtcDevSwitchNames,
2596 arraysize(kWebRtcDevSwitchNames)); 2595 arraysize(kWebRtcDevSwitchNames));
2597 } 2596 }
2598 } 2597 }
2599 #endif // defined(ENABLE_WEBRTC) 2598 #endif // defined(ENABLE_WEBRTC)
2600 2599
2601 } // namespace chrome 2600 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698