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

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

Issue 2340743003: Add new BrowserForceSigninEnabeld policy option with future:true flag. (Closed)
Patch Set: Created 4 years, 3 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/browser/profiles/profiles_state.cc » ('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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
357 prefs::kHardwareAccelerationModeEnabled, 357 prefs::kHardwareAccelerationModeEnabled,
358 base::Value::TYPE_BOOLEAN }, 358 base::Value::TYPE_BOOLEAN },
359 { key::kAllowDinosaurEasterEgg, 359 { key::kAllowDinosaurEasterEgg,
360 prefs::kAllowDinosaurEasterEgg, 360 prefs::kAllowDinosaurEasterEgg,
361 base::Value::TYPE_BOOLEAN }, 361 base::Value::TYPE_BOOLEAN },
362 { key::kAllowedDomainsForApps, 362 { key::kAllowedDomainsForApps,
363 prefs::kAllowedDomainsForApps, 363 prefs::kAllowedDomainsForApps,
364 base::Value::TYPE_STRING }, 364 base::Value::TYPE_STRING },
365 { key::kComponentUpdatesEnabled, 365 { key::kComponentUpdatesEnabled,
366 prefs::kComponentUpdatesEnabled, 366 prefs::kComponentUpdatesEnabled,
367 base::Value::TYPE_BOOLEAN }, 367 base::Value::TYPE_BOOLEAN },
pastarmovj 2016/09/14 19:56:29 Please revert the line removal.
zmin 2016/09/14 20:39:44 Done.
368
369 #if defined(ENABLE_SPELLCHECK) 368 #if defined(ENABLE_SPELLCHECK)
370 { key::kSpellCheckServiceEnabled, 369 { key::kSpellCheckServiceEnabled,
371 spellcheck::prefs::kSpellCheckUseSpellingService, 370 spellcheck::prefs::kSpellCheckUseSpellingService,
372 base::Value::TYPE_BOOLEAN }, 371 base::Value::TYPE_BOOLEAN },
373 #endif // defined(ENABLE_SPELLCHECK) 372 #endif // defined(ENABLE_SPELLCHECK)
374 373
375 { key::kDisableScreenshots, 374 { key::kDisableScreenshots,
376 prefs::kDisableScreenshots, 375 prefs::kDisableScreenshots,
377 base::Value::TYPE_BOOLEAN }, 376 base::Value::TYPE_BOOLEAN },
378 { key::kAudioCaptureAllowed, 377 { key::kAudioCaptureAllowed,
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 565 #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
567 { key::kNativeMessagingUserLevelHosts, 566 { key::kNativeMessagingUserLevelHosts,
568 extensions::pref_names::kNativeMessagingUserLevelHosts, 567 extensions::pref_names::kNativeMessagingUserLevelHosts,
569 base::Value::TYPE_BOOLEAN }, 568 base::Value::TYPE_BOOLEAN },
570 { key::kBrowserGuestModeEnabled, 569 { key::kBrowserGuestModeEnabled,
571 prefs::kBrowserGuestModeEnabled, 570 prefs::kBrowserGuestModeEnabled,
572 base::Value::TYPE_BOOLEAN }, 571 base::Value::TYPE_BOOLEAN },
573 { key::kBrowserAddPersonEnabled, 572 { key::kBrowserAddPersonEnabled,
574 prefs::kBrowserAddPersonEnabled, 573 prefs::kBrowserAddPersonEnabled,
575 base::Value::TYPE_BOOLEAN }, 574 base::Value::TYPE_BOOLEAN },
575 { key::kBrowserForceSigninEnabled,
pastarmovj 2016/09/14 19:56:29 I don't think the 'Browser' prefix is useful or ra
zmin 2016/09/14 20:39:44 Yes, I use 'Browser' here just because of the two
576 prefs::kBrowserForceSigninEnabled,
577 base::Value::TYPE_BOOLEAN },
576 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) 578 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
577 579
578 #if defined(OS_WIN) 580 #if defined(OS_WIN)
579 { key::kWelcomePageOnOSUpgradeEnabled, 581 { key::kWelcomePageOnOSUpgradeEnabled,
580 prefs::kWelcomePageOnOSUpgradeEnabled, 582 prefs::kWelcomePageOnOSUpgradeEnabled,
581 base::Value::TYPE_BOOLEAN }, 583 base::Value::TYPE_BOOLEAN },
582 #endif // OS_WIN 584 #endif // OS_WIN
583 585
584 #if !defined(OS_ANDROID) 586 #if !defined(OS_ANDROID)
585 { key::kSuppressUnsupportedOSWarning, 587 { key::kSuppressUnsupportedOSWarning,
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 880 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
879 handlers->AddHandler( 881 handlers->AddHandler(
880 base::MakeUnique<chromeos::KeyPermissionsPolicyHandler>(chrome_schema)); 882 base::MakeUnique<chromeos::KeyPermissionsPolicyHandler>(chrome_schema));
881 handlers->AddHandler(base::WrapUnique(new DefaultGeolocationPolicyHandler())); 883 handlers->AddHandler(base::WrapUnique(new DefaultGeolocationPolicyHandler()));
882 #endif // defined(OS_CHROMEOS) 884 #endif // defined(OS_CHROMEOS)
883 885
884 return handlers; 886 return handlers;
885 } 887 }
886 888
887 } // namespace policy 889 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profiles_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698