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

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

Issue 2200403002: [asm.js] [wasm] Adds a UI flag for enabling the Wasm backend for Asm.js (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes histograms.xml Created 4 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 | « chrome/browser/about_flags.cc ('k') | content/public/common/content_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 <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 1617 matching lines...) Expand 10 before | Expand all | Expand 10 after
1628 spellcheck::switches::kEnableAndroidSpellChecker, 1628 spellcheck::switches::kEnableAndroidSpellChecker,
1629 #endif 1629 #endif
1630 switches::kEnableBenchmarking, 1630 switches::kEnableBenchmarking,
1631 switches::kEnableNaCl, 1631 switches::kEnableNaCl,
1632 #if !defined(DISABLE_NACL) 1632 #if !defined(DISABLE_NACL)
1633 switches::kEnableNaClDebug, 1633 switches::kEnableNaClDebug,
1634 switches::kEnableNaClNonSfiMode, 1634 switches::kEnableNaClNonSfiMode,
1635 #endif 1635 #endif
1636 switches::kEnableNetBenchmarking, 1636 switches::kEnableNetBenchmarking,
1637 switches::kEnableNewBookmarkApps, 1637 switches::kEnableNewBookmarkApps,
1638 switches::kEnableAsmWasm,
jam 2016/08/10 17:32:50 since this is a command line flag that content kno
John 2016/08/11 11:33:00 Done. As per offline talk, kEnableWasm was also mo
1638 switches::kEnableWasm, 1639 switches::kEnableWasm,
1639 #if !defined(DISABLE_NACL) 1640 #if !defined(DISABLE_NACL)
1640 switches::kForcePNaClSubzero, 1641 switches::kForcePNaClSubzero,
1641 #endif 1642 #endif
1642 switches::kJavaScriptHarmony, 1643 switches::kJavaScriptHarmony,
1643 switches::kMessageLoopHistogrammer, 1644 switches::kMessageLoopHistogrammer,
1644 switches::kOriginTrialDisabledFeatures, 1645 switches::kOriginTrialDisabledFeatures,
1645 switches::kOriginTrialPublicKey, 1646 switches::kOriginTrialPublicKey,
1646 switches::kPpapiFlashArgs, 1647 switches::kPpapiFlashArgs,
1647 switches::kPpapiFlashPath, 1648 switches::kPpapiFlashPath,
(...skipping 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after
3062 if (channel <= kMaxDisableEncryptionChannel) { 3063 if (channel <= kMaxDisableEncryptionChannel) {
3063 static const char* const kWebRtcDevSwitchNames[] = { 3064 static const char* const kWebRtcDevSwitchNames[] = {
3064 switches::kDisableWebRtcEncryption, 3065 switches::kDisableWebRtcEncryption,
3065 }; 3066 };
3066 to_command_line->CopySwitchesFrom(from_command_line, 3067 to_command_line->CopySwitchesFrom(from_command_line,
3067 kWebRtcDevSwitchNames, 3068 kWebRtcDevSwitchNames,
3068 arraysize(kWebRtcDevSwitchNames)); 3069 arraysize(kWebRtcDevSwitchNames));
3069 } 3070 }
3070 } 3071 }
3071 #endif // defined(ENABLE_WEBRTC) 3072 #endif // defined(ENABLE_WEBRTC)
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698