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

Side by Side Diff: chrome/browser/policy/configuration_policy_handler_list_factory.cc

Issue 2056343006: Remove DHE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: actually connect up the feature flag Created 4 years, 6 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
« no previous file with comments | « no previous file | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/browser/policy/configuration_policy_handler_list_factory.h" 5 #include "chrome/browser/policy/configuration_policy_handler_list_factory.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <utility> 10 #include <utility>
(...skipping 374 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 base::Value::TYPE_STRING }, 385 base::Value::TYPE_STRING },
386 { key::kSupervisedUserCreationEnabled, 386 { key::kSupervisedUserCreationEnabled,
387 prefs::kSupervisedUserCreationAllowed, 387 prefs::kSupervisedUserCreationAllowed,
388 base::Value::TYPE_BOOLEAN }, 388 base::Value::TYPE_BOOLEAN },
389 { key::kForceEphemeralProfiles, 389 { key::kForceEphemeralProfiles,
390 prefs::kForceEphemeralProfiles, 390 prefs::kForceEphemeralProfiles,
391 base::Value::TYPE_BOOLEAN }, 391 base::Value::TYPE_BOOLEAN },
392 { key::kSSLVersionFallbackMin, 392 { key::kSSLVersionFallbackMin,
393 ssl_config::prefs::kSSLVersionFallbackMin, 393 ssl_config::prefs::kSSLVersionFallbackMin,
394 base::Value::TYPE_STRING }, 394 base::Value::TYPE_STRING },
395 { key::kDHEEnabled,
396 ssl_config::prefs::kDHEEnabled,
397 base::Value::TYPE_BOOLEAN },
395 #if defined(ENABLE_MEDIA_ROUTER) 398 #if defined(ENABLE_MEDIA_ROUTER)
396 { key::kEnableMediaRouter, 399 { key::kEnableMediaRouter,
397 prefs::kEnableMediaRouter, 400 prefs::kEnableMediaRouter,
398 base::Value::TYPE_BOOLEAN }, 401 base::Value::TYPE_BOOLEAN },
399 #endif // defined(ENABLE_MEDIA_ROUTER) 402 #endif // defined(ENABLE_MEDIA_ROUTER)
400 #if !defined(OS_MACOSX) 403 #if !defined(OS_MACOSX)
401 { key::kFullscreenAllowed, 404 { key::kFullscreenAllowed,
402 prefs::kFullscreenAllowed, 405 prefs::kFullscreenAllowed,
403 base::Value::TYPE_BOOLEAN }, 406 base::Value::TYPE_BOOLEAN },
404 #if defined(ENABLE_EXTENSIONS) 407 #if defined(ENABLE_EXTENSIONS)
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
852 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 855 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
853 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 856 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
854 handlers->AddHandler(base::WrapUnique( 857 handlers->AddHandler(base::WrapUnique(
855 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 858 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
856 #endif // defined(OS_CHROMEOS) 859 #endif // defined(OS_CHROMEOS)
857 860
858 return handlers; 861 return handlers;
859 } 862 }
860 863
861 } // namespace policy 864 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/test/data/policy/policy_test_cases.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698