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

Side by Side Diff: chrome/common/chrome_switches.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, 3 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/common/chrome_switches.h ('k') | chrome/renderer/chrome_render_process_observer.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/common/chrome_switches.h" 5 #include "chrome/common/chrome_switches.h"
6 6
7 #include "base/base_switches.h" 7 #include "base/base_switches.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 9
10 namespace switches { 10 namespace switches {
(...skipping 741 matching lines...) Expand 10 before | Expand all | Expand 10 after
752 // app/extension ID given, and then prompt the user to download and install it. 752 // app/extension ID given, and then prompt the user to download and install it.
753 const char kInstallFromWebstore[] = "install-from-webstore"; 753 const char kInstallFromWebstore[] = "install-from-webstore";
754 754
755 // Marks a renderer as an Instant process. 755 // Marks a renderer as an Instant process.
756 const char kInstantProcess[] = "instant-process"; 756 const char kInstantProcess[] = "instant-process";
757 757
758 // Invalidation service should use GCM network channel even if experiment is not 758 // Invalidation service should use GCM network channel even if experiment is not
759 // enabled. 759 // enabled.
760 const char kInvalidationUseGCMChannel[] = "invalidation-use-gcm-channel"; 760 const char kInvalidationUseGCMChannel[] = "invalidation-use-gcm-channel";
761 761
762 // Enables experimental Harmony (ECMAScript 6) features.
763 const char kJavaScriptHarmony[] = "javascript-harmony";
764
765 // Specifies the testcase used by the IPC fuzzer. 762 // Specifies the testcase used by the IPC fuzzer.
766 const char kIpcFuzzerTestcase[] = "ipc-fuzzer-testcase"; 763 const char kIpcFuzzerTestcase[] = "ipc-fuzzer-testcase";
767 764
768 // Used for testing - keeps browser alive after last browser window closes. 765 // Used for testing - keeps browser alive after last browser window closes.
769 const char kKeepAliveForTest[] = "keep-alive-for-test"; 766 const char kKeepAliveForTest[] = "keep-alive-for-test";
770 767
771 // Enable Kiosk mode. 768 // Enable Kiosk mode.
772 const char kKioskMode[] = "kiosk"; 769 const char kKioskMode[] = "kiosk";
773 770
774 // Print automatically in kiosk mode. |kKioskMode| must be set as well. 771 // Print automatically in kiosk mode. |kKioskMode| must be set as well.
(...skipping 570 matching lines...) Expand 10 before | Expand all | Expand 10 after
1345 1342
1346 // ----------------------------------------------------------------------------- 1343 // -----------------------------------------------------------------------------
1347 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1344 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1348 // 1345 //
1349 // You were going to just dump your switches here, weren't you? Instead, please 1346 // You were going to just dump your switches here, weren't you? Instead, please
1350 // put them in alphabetical order above, or in order inside the appropriate 1347 // put them in alphabetical order above, or in order inside the appropriate
1351 // ifdef at the bottom. The order should match the header. 1348 // ifdef at the bottom. The order should match the header.
1352 // ----------------------------------------------------------------------------- 1349 // -----------------------------------------------------------------------------
1353 1350
1354 } // namespace switches 1351 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/renderer/chrome_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698