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

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

Issue 1226643002: Welcome page changes for Windows 10 and over. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rewording in policy_templates.json and sync to position 338549 Created 5 years, 5 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 | « chrome/browser/first_run/first_run_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.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 "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/memory/scoped_vector.h" 9 #include "base/memory/scoped_vector.h"
10 #include "base/prefs/pref_value_map.h" 10 #include "base/prefs/pref_value_map.h"
(...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 { key::kNativeMessagingUserLevelHosts, 491 { key::kNativeMessagingUserLevelHosts,
492 extensions::pref_names::kNativeMessagingUserLevelHosts, 492 extensions::pref_names::kNativeMessagingUserLevelHosts,
493 base::Value::TYPE_BOOLEAN }, 493 base::Value::TYPE_BOOLEAN },
494 { key::kBrowserGuestModeEnabled, 494 { key::kBrowserGuestModeEnabled,
495 prefs::kBrowserGuestModeEnabled, 495 prefs::kBrowserGuestModeEnabled,
496 base::Value::TYPE_BOOLEAN }, 496 base::Value::TYPE_BOOLEAN },
497 { key::kBrowserAddPersonEnabled, 497 { key::kBrowserAddPersonEnabled,
498 prefs::kBrowserAddPersonEnabled, 498 prefs::kBrowserAddPersonEnabled,
499 base::Value::TYPE_BOOLEAN }, 499 base::Value::TYPE_BOOLEAN },
500 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS) 500 #endif // !defined(OS_CHROMEOS) && !defined(OS_ANDROID) && !defined(OS_IOS)
501
502 #if defined(OS_WIN)
503 { key::kWelcomePageOnOSUpgradeEnabled,
504 prefs::kWelcomePageOnOSUpgradeEnabled,
505 base::Value::TYPE_BOOLEAN },
506 #endif // OS_WIN
501 }; 507 };
502 508
503 class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler { 509 class ForceSafeSearchPolicyHandler : public TypeCheckingPolicyHandler {
504 public: 510 public:
505 ForceSafeSearchPolicyHandler() 511 ForceSafeSearchPolicyHandler()
506 : TypeCheckingPolicyHandler(key::kForceSafeSearch, 512 : TypeCheckingPolicyHandler(key::kForceSafeSearch,
507 base::Value::TYPE_BOOLEAN) {} 513 base::Value::TYPE_BOOLEAN) {}
508 ~ForceSafeSearchPolicyHandler() override {} 514 ~ForceSafeSearchPolicyHandler() override {}
509 515
510 // ConfigurationPolicyHandler implementation: 516 // ConfigurationPolicyHandler implementation:
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
779 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 785 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
780 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 786 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
781 handlers->AddHandler(make_scoped_ptr( 787 handlers->AddHandler(make_scoped_ptr(
782 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 788 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
783 #endif // defined(OS_CHROMEOS) 789 #endif // defined(OS_CHROMEOS)
784 790
785 return handlers.Pass(); 791 return handlers.Pass();
786 } 792 }
787 793
788 } // namespace policy 794 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run_unittest.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698