diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 17:46:58 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 17:46:58 +0000 |
| commit | 177b96b340223f6f280307f7ee7d77cf10ee245d (patch) | |
| tree | c00c449c1fb789d5b74cb1d14a8e9af890eaae35 | |
| parent | fe49c06af5f3df96b548c91e4a13ef207d3b703b (diff) | |
| download | chromium_src-177b96b340223f6f280307f7ee7d77cf10ee245d.zip chromium_src-177b96b340223f6f280307f7ee7d77cf10ee245d.tar.gz chromium_src-177b96b340223f6f280307f7ee7d77cf10ee245d.tar.bz2 | |
Remove disable-cloud-policy from about:flags
BUG=174353
Review URL: https://chromiumcodereview.appspot.com/12226059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181332 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/app/generated_resources.grd | 7 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 4febe94..bf80850 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -15634,13 +15634,6 @@ Some features may be unavailable. Please check that the profile exists and you When enabled, a guest user will be available in desktop Chrome. </message> - <message name="IDS_FLAGS_DISABLE_DESKTOP_CLOUD_POLICY_NAME" desc="Name of about:flags option to turn off loading desktop cloud policy for signed in profiles"> - Disable desktop cloud policy - </message> - <message name="IDS_FLAGS_DISABLE_DESKTOP_CLOUD_POLICY_DESCRIPTION" desc="Description of about:flags option to turn off desktop cloud policy for signed in profiles"> - When set, loading of cloud policy for signed-in profiles will be disabled. - </message> - <!-- Toast experiment. --> <message name="IDS_TRY_TOAST_SET_DEFAULT" desc="Text of the checkbox to make chrome the default browser"> Make it my default browser diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index c9f9d8c..408120b 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -1266,13 +1266,6 @@ const Experiment kExperiments[] = { kOsWin | kOsCrOS, SINGLE_VALUE_TYPE(switches::kEnableTouchDragDrop) }, - { - "disable-cloud-policy-on-signin", - IDS_FLAGS_DISABLE_DESKTOP_CLOUD_POLICY_NAME, - IDS_FLAGS_DISABLE_DESKTOP_CLOUD_POLICY_DESCRIPTION, - kOsWin | kOsMac | kOsLinux, - SINGLE_VALUE_TYPE(switches::kDisableCloudPolicyOnSignin) - }, #if defined(ENABLE_MESSAGE_CENTER) { "enable-rich-notifications", |