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

Side by Side Diff: chrome/common/chrome_switches.cc

Issue 2681663004: Mustash: Ignore --mash flag when comparing flags in UserSessionManager. (Closed)
Patch Set: Addressing feedback Created 3 years, 10 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 "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 1087 matching lines...) Expand 10 before | Expand all | Expand 10 after
1098 const char kWatcherProcess[] = "watcher"; 1098 const char kWatcherProcess[] = "watcher";
1099 1099
1100 // Enables custom-drawing the titlebar and tabstrip background so that it's not 1100 // Enables custom-drawing the titlebar and tabstrip background so that it's not
1101 // a garish #FFFFFF like it is by default on Windows 10. 1101 // a garish #FFFFFF like it is by default on Windows 10.
1102 const char kWindows10CustomTitlebar[] = "windows10-custom-titlebar"; 1102 const char kWindows10CustomTitlebar[] = "windows10-custom-titlebar";
1103 1103
1104 // Indicates that chrome was launched to service a search request in Windows 8. 1104 // Indicates that chrome was launched to service a search request in Windows 8.
1105 const char kWindows8Search[] = "windows8-search"; 1105 const char kWindows8Search[] = "windows8-search";
1106 #endif // defined(OS_WIN) 1106 #endif // defined(OS_WIN)
1107 1107
1108 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
1109 // Used to enable Mus+ash.
1110 const char kMash[] = "mash";
1111 #endif
1112
1108 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) 1113 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD)
1109 // Enables support to debug printing subsystem. 1114 // Enables support to debug printing subsystem.
1110 const char kDebugPrint[] = "debug-print"; 1115 const char kDebugPrint[] = "debug-print";
1111 #endif 1116 #endif
1112 1117
1113 #if BUILDFLAG(ENABLE_PLUGINS) 1118 #if BUILDFLAG(ENABLE_PLUGINS)
1114 // Specifies comma-separated list of extension ids or hosts to grant 1119 // Specifies comma-separated list of extension ids or hosts to grant
1115 // access to CRX file system APIs. 1120 // access to CRX file system APIs.
1116 const char kAllowNaClCrxFsAPI[] = "allow-nacl-crxfs-api"; 1121 const char kAllowNaClCrxFsAPI[] = "allow-nacl-crxfs-api";
1117 1122
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 1173
1169 // ----------------------------------------------------------------------------- 1174 // -----------------------------------------------------------------------------
1170 // 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.
1171 // 1176 //
1172 // 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
1173 // 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
1174 // ifdef at the bottom. The order should match the header. 1179 // ifdef at the bottom. The order should match the header.
1175 // ----------------------------------------------------------------------------- 1180 // -----------------------------------------------------------------------------
1176 1181
1177 } // namespace switches 1182 } // namespace switches
OLDNEW
« chrome/app/mash/mash_runner.cc ('K') | « chrome/common/chrome_switches.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698