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

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

Issue 2655873002: Get enrollment token from DMServer when an Active Directory user uses ARC (Closed)
Patch Set: Add ClientId to DMServer request. 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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 // given file. The file is overwritten if it exists. 293 // given file. The file is overwritten if it exists.
294 const char kDumpBrowserHistograms[] = "dump-browser-histograms"; 294 const char kDumpBrowserHistograms[] = "dump-browser-histograms";
295 295
296 // Overrides the path of Easy Unlock component app. 296 // Overrides the path of Easy Unlock component app.
297 const char kEasyUnlockAppPath[] = "easy-unlock-app-path"; 297 const char kEasyUnlockAppPath[] = "easy-unlock-app-path";
298 298
299 // Enables the display of a banner allowing the user to add a web 299 // Enables the display of a banner allowing the user to add a web
300 // app to their shelf (or platform-specific equivalent) 300 // app to their shelf (or platform-specific equivalent)
301 const char kEnableAddToShelf[] = "enable-add-to-shelf"; 301 const char kEnableAddToShelf[] = "enable-add-to-shelf";
302 302
303 // Enables using Android apps for Active Directory-enrolled users.
304 const char kEnableAndroidWithActiveDirectory[] =
305 "enable-android-with-active-directory";
Luis Héctor Chávez 2017/02/06 22:00:15 We're trying to consolidate the multiple ARC-relat
Marton Hunyady 2017/02/07 14:53:42 Done.
306
303 // If the WebRTC logging private API is active, enables audio debug recordings. 307 // If the WebRTC logging private API is active, enables audio debug recordings.
304 const char kEnableAudioDebugRecordingsFromExtension[] = 308 const char kEnableAudioDebugRecordingsFromExtension[] =
305 "enable-audio-debug-recordings-from-extension"; 309 "enable-audio-debug-recordings-from-extension";
306 310
307 // Enables the benchmarking extensions. 311 // Enables the benchmarking extensions.
308 const char kEnableBenchmarking[] = "enable-benchmarking"; 312 const char kEnableBenchmarking[] = "enable-benchmarking";
309 313
310 // Enables the multi-level undo system for bookmarks. 314 // Enables the multi-level undo system for bookmarks.
311 const char kEnableBookmarkUndo[] = "enable-bookmark-undo"; 315 const char kEnableBookmarkUndo[] = "enable-bookmark-undo";
312 316
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
1168 1172
1169 // ----------------------------------------------------------------------------- 1173 // -----------------------------------------------------------------------------
1170 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE. 1174 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE.
1171 // 1175 //
1172 // You were going to just dump your switches here, weren't you? Instead, please 1176 // 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 1177 // put them in alphabetical order above, or in order inside the appropriate
1174 // ifdef at the bottom. The order should match the header. 1178 // ifdef at the bottom. The order should match the header.
1175 // ----------------------------------------------------------------------------- 1179 // -----------------------------------------------------------------------------
1176 1180
1177 } // namespace switches 1181 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698