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/common/chrome_switches.cc

Issue 2741783007: Convert ENABLE_WAYLAND_SERVER to a build flag. (Closed)
Patch Set: errrrr Created 3 years, 9 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/common/features.gni » ('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 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "ppapi/features/features.h" 10 #include "ppapi/features/features.h"
(...skipping 1111 matching lines...) Expand 10 before | Expand all | Expand 10 after
1122 1122
1123 // Specifies comma-separated list of extension ids or hosts to grant 1123 // Specifies comma-separated list of extension ids or hosts to grant
1124 // access to file handle APIs. 1124 // access to file handle APIs.
1125 const char kAllowNaClFileHandleAPI[] = "allow-nacl-file-handle-api"; 1125 const char kAllowNaClFileHandleAPI[] = "allow-nacl-file-handle-api";
1126 1126
1127 // Specifies comma-separated list of extension ids or hosts to grant 1127 // Specifies comma-separated list of extension ids or hosts to grant
1128 // access to TCP/UDP socket APIs. 1128 // access to TCP/UDP socket APIs.
1129 const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api"; 1129 const char kAllowNaClSocketAPI[] = "allow-nacl-socket-api";
1130 #endif 1130 #endif
1131 1131
1132 #if defined(ENABLE_WAYLAND_SERVER) 1132 #if BUILDFLAG(ENABLE_WAYLAND_SERVER)
1133 // Enables Wayland display server support. 1133 // Enables Wayland display server support.
1134 const char kEnableWaylandServer[] = "enable-wayland-server"; 1134 const char kEnableWaylandServer[] = "enable-wayland-server";
1135 #endif 1135 #endif
1136 1136
1137 #if defined(OS_WIN) || defined(OS_LINUX) 1137 #if defined(OS_WIN) || defined(OS_LINUX)
1138 extern const char kDisableInputImeAPI[] = "disable-input-ime-api"; 1138 extern const char kDisableInputImeAPI[] = "disable-input-ime-api";
1139 extern const char kEnableInputImeAPI[] = "enable-input-ime-api"; 1139 extern const char kEnableInputImeAPI[] = "enable-input-ime-api";
1140 #endif 1140 #endif
1141 1141
1142 bool ExtensionsDisabled(const base::CommandLine& command_line) { 1142 bool ExtensionsDisabled(const base::CommandLine& command_line) {
(...skipping 30 matching lines...) Expand all
1173 1173
1174 // ----------------------------------------------------------------------------- 1174 // -----------------------------------------------------------------------------
1175 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE. 1175 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE.
1176 // 1176 //
1177 // You were going to just dump your switches here, weren't you? Instead, please 1177 // You were going to just dump your switches here, weren't you? Instead, please
1178 // put them in alphabetical order above, or in order inside the appropriate 1178 // put them in alphabetical order above, or in order inside the appropriate
1179 // ifdef at the bottom. The order should match the header. 1179 // ifdef at the bottom. The order should match the header.
1180 // ----------------------------------------------------------------------------- 1180 // -----------------------------------------------------------------------------
1181 1181
1182 } // namespace switches 1182 } // namespace switches
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.h ('k') | chrome/common/features.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698