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

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

Issue 2564973002: Add an infobar if a session is being controlled by an automated test. (Closed)
Patch Set: tweak wording, temporarily re-introduce load-component-extension Created 3 years, 11 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 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 // Used for testing - keeps browser alive after last browser window closes. 553 // Used for testing - keeps browser alive after last browser window closes.
554 const char kKeepAliveForTest[] = "keep-alive-for-test"; 554 const char kKeepAliveForTest[] = "keep-alive-for-test";
555 555
556 // Enable Kiosk mode. 556 // Enable Kiosk mode.
557 const char kKioskMode[] = "kiosk"; 557 const char kKioskMode[] = "kiosk";
558 558
559 // Print automatically in kiosk mode. |kKioskMode| must be set as well. 559 // Print automatically in kiosk mode. |kKioskMode| must be set as well.
560 // See http://crbug.com/31395. 560 // See http://crbug.com/31395.
561 const char kKioskModePrinting[] = "kiosk-printing"; 561 const char kKioskModePrinting[] = "kiosk-printing";
562 562
563 // Comma-separated list of directories with component extensions to load.
564 const char kLoadComponentExtension[] = "load-component-extension";
Devlin 2017/02/01 23:05:00 (as in extension_service.cc, let's make this a sep
samuong 2017/02/04 00:11:03 Done.
565
563 // Loads an extension from the specified directory. 566 // Loads an extension from the specified directory.
564 const char kLoadExtension[] = "load-extension"; 567 const char kLoadExtension[] = "load-extension";
565 568
566 // Loads the Media Router component extension on startup. 569 // Loads the Media Router component extension on startup.
567 const char kLoadMediaRouterComponentExtension[] = 570 const char kLoadMediaRouterComponentExtension[] =
568 "load-media-router-component-extension"; 571 "load-media-router-component-extension";
569 572
570 // Makes Chrome default browser 573 // Makes Chrome default browser
571 const char kMakeDefaultBrowser[] = "make-default-browser"; 574 const char kMakeDefaultBrowser[] = "make-default-browser";
572 575
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
1226 1229
1227 // ----------------------------------------------------------------------------- 1230 // -----------------------------------------------------------------------------
1228 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE. 1231 // DO NOT ADD YOUR VERY NICE FLAGS TO THE BOTTOM OF THIS FILE.
1229 // 1232 //
1230 // You were going to just dump your switches here, weren't you? Instead, please 1233 // You were going to just dump your switches here, weren't you? Instead, please
1231 // put them in alphabetical order above, or in order inside the appropriate 1234 // put them in alphabetical order above, or in order inside the appropriate
1232 // ifdef at the bottom. The order should match the header. 1235 // ifdef at the bottom. The order should match the header.
1233 // ----------------------------------------------------------------------------- 1236 // -----------------------------------------------------------------------------
1234 1237
1235 } // namespace switches 1238 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698