From cdc18419525f8691d041f0a83bb59f8d70b82ecf Mon Sep 17 00:00:00 2001 From: "scr@chromium.org" Date: Thu, 5 Jan 2012 20:36:43 +0000 Subject: Disable the Protector feature. R=sky@chromium.org BUG=109229 TEST= Review URL: http://codereview.chromium.org/9109005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116539 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/common/chrome_switches.cc | 8 ++++---- chrome/common/chrome_switches.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'chrome/common') diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 6935d83..1f32945 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -954,9 +954,6 @@ const char kProfilingFlush[] = "profiling-flush"; // Specifies a custom URL for fetching NTP promo data. const char kPromoServerURL[] = "promo-server-url"; -// Disables the protector. -const char kNoProtector[] = "no-protector"; - // Forces proxy auto-detection. const char kProxyAutoDetect[] = "proxy-auto-detect"; @@ -1120,6 +1117,9 @@ const char kUninstall[] = "uninstall"; // implementations). const char kUseMoreWebUI[] = "use-more-webui"; +// Enables the protector. +const char kUseProtector[] = "use-protector"; + // Uses a pure Views implementation when available (rather than platform-native // implementation such as GTK). const char kUsePureViews[] = "use-pure-views"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 6067d75..da875d6 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -262,7 +262,6 @@ extern const char kProfilingAtStart[]; extern const char kProfilingFile[]; extern const char kProfilingFlush[]; extern const char kPromoServerURL[]; -extern const char kNoProtector[]; extern const char kProxyAutoDetect[]; extern const char kProxyBypassList[]; extern const char kProxyPacUrl[]; @@ -306,6 +305,7 @@ extern const char kTouchOptimizedUI[]; extern const char kTryChromeAgain[]; extern const char kUninstall[]; extern const char kUseMoreWebUI[]; +extern const char kUseProtector[]; extern const char kUsePureViews[]; extern const char kUseSpdy[]; extern const char kIgnoreCertificateErrors[]; -- cgit v1.1