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

Side by Side Diff: content/public/common/content_switches.cc

Issue 588543003: 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
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 "content/public/common/content_switches.h" 5 #include "content/public/common/content_switches.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 8
9 namespace switches { 9 namespace switches {
10 10
(...skipping 539 matching lines...) Expand 10 before | Expand all | Expand 10 after
550 // Run the GPU process as a thread in the browser process. 550 // Run the GPU process as a thread in the browser process.
551 const char kInProcessGPU[] = "in-process-gpu"; 551 const char kInProcessGPU[] = "in-process-gpu";
552 552
553 // Overrides the timeout, in seconds, that a child process waits for a 553 // Overrides the timeout, in seconds, that a child process waits for a
554 // connection from the browser before killing itself. 554 // connection from the browser before killing itself.
555 const char kIPCConnectionTimeout[] = "ipc-connection-timeout"; 555 const char kIPCConnectionTimeout[] = "ipc-connection-timeout";
556 556
557 // Specifies the flags passed to JS engine 557 // Specifies the flags passed to JS engine
558 const char kJavaScriptFlags[] = "js-flags"; 558 const char kJavaScriptFlags[] = "js-flags";
559 559
560 // Enable Harmony (ECMAScript 6) experimental features in JavaScript.
561 const char kJavaScriptHarmony[] = "enable-javascript-harmony";
562
560 // Load an NPAPI plugin from the specified path. 563 // Load an NPAPI plugin from the specified path.
561 const char kLoadPlugin[] = "load-plugin"; 564 const char kLoadPlugin[] = "load-plugin";
562 565
563 // Logs GPU control list decisions when enforcing blacklist rules. 566 // Logs GPU control list decisions when enforcing blacklist rules.
564 const char kLogGpuControlListDecisions[] = "log-gpu-control-list-decisions"; 567 const char kLogGpuControlListDecisions[] = "log-gpu-control-list-decisions";
565 568
566 // Sets the minimum log level. Valid values are from 0 to 3: 569 // Sets the minimum log level. Valid values are from 0 to 3:
567 // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3. 570 // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
568 const char kLoggingLevel[] = "log-level"; 571 const char kLoggingLevel[] = "log-level";
569 572
(...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 // Enable the Win32K process mitigation policy for renderer processes which 940 // Enable the Win32K process mitigation policy for renderer processes which
938 // prevents them from invoking user32 and gdi32 system calls which enter 941 // prevents them from invoking user32 and gdi32 system calls which enter
939 // the kernel. This is only supported on Windows 8 and beyond. 942 // the kernel. This is only supported on Windows 8 and beyond.
940 const char kEnableWin32kRendererLockDown[] 943 const char kEnableWin32kRendererLockDown[]
941 = "enable_win32k_renderer_lockdown"; 944 = "enable_win32k_renderer_lockdown";
942 #endif 945 #endif
943 946
944 // Don't dump stuff here, follow the same order as the header. 947 // Don't dump stuff here, follow the same order as the header.
945 948
946 } // namespace switches 949 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698