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

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

Issue 14924002: WebUI for Profile Settings Reset (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed vasilii's comments and fixed a merge error Created 7 years, 7 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 | Annotate | Revision Log
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 9
10 namespace switches { 10 namespace switches {
(...skipping 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 // Enables tracking of tasks in profiler for viewing via about:profiler. 623 // Enables tracking of tasks in profiler for viewing via about:profiler.
624 // To predominantly disable tracking (profiling), use the command line switch: 624 // To predominantly disable tracking (profiling), use the command line switch:
625 // --enable-profiling=0 625 // --enable-profiling=0
626 // Some tracking will still take place at startup, but it will be turned off 626 // Some tracking will still take place at startup, but it will be turned off
627 // during chrome_browser_main. 627 // during chrome_browser_main.
628 const char kEnableProfiling[] = "enable-profiling"; 628 const char kEnableProfiling[] = "enable-profiling";
629 629
630 // Enables support for the QUIC protocol. This is a temporary testing flag. 630 // Enables support for the QUIC protocol. This is a temporary testing flag.
631 const char kEnableQuic[] = "enable-quic"; 631 const char kEnableQuic[] = "enable-quic";
632 632
633 // Enables support in chrome://settings to reset settings in your profile
634 // that are often touched by malware.
635 const char kEnableResetProfileSettings[] = "enable-reset-profile-settings";
636
633 // Enables content settings based on host *and* plug-in in the user 637 // Enables content settings based on host *and* plug-in in the user
634 // preferences. 638 // preferences.
635 const char kEnableResourceContentSettings[] = 639 const char kEnableResourceContentSettings[] =
636 "enable-resource-content-settings"; 640 "enable-resource-content-settings";
637 641
638 // Controls the support for SDCH filtering (dictionary based expansion of 642 // Controls the support for SDCH filtering (dictionary based expansion of
639 // content). By default SDCH filtering is enabled. To disable SDCH filtering, 643 // content). By default SDCH filtering is enabled. To disable SDCH filtering,
640 // use "--enable-sdch=0" as command line argument. SDCH is currently only 644 // use "--enable-sdch=0" as command line argument. SDCH is currently only
641 // supported server-side for searches on google.com. 645 // supported server-side for searches on google.com.
642 const char kEnableSdch[] = "enable-sdch"; 646 const char kEnableSdch[] = "enable-sdch";
(...skipping 942 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 1589
1586 // ----------------------------------------------------------------------------- 1590 // -----------------------------------------------------------------------------
1587 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE. 1591 // DO NOT ADD YOUR CRAP TO THE BOTTOM OF THIS FILE.
1588 // 1592 //
1589 // You were going to just dump your switches here, weren't you? Instead, please 1593 // You were going to just dump your switches here, weren't you? Instead, please
1590 // put them in alphabetical order above, or in order inside the appropriate 1594 // put them in alphabetical order above, or in order inside the appropriate
1591 // ifdef at the bottom. The order should match the header. 1595 // ifdef at the bottom. The order should match the header.
1592 // ----------------------------------------------------------------------------- 1596 // -----------------------------------------------------------------------------
1593 1597
1594 } // namespace switches 1598 } // namespace switches
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698