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

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

Issue 1552863003: Global conversion of Pass()→std::move(): CrOS edition (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/net/nss_context_chromeos.cc ('k') | chrome/browser/policy/policy_browsertest.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 #include <utility>
9 10
10 #include "base/bind.h" 11 #include "base/bind.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_vector.h" 13 #include "base/memory/scoped_vector.h"
13 #include "base/prefs/pref_value_map.h" 14 #include "base/prefs/pref_value_map.h"
14 #include "base/values.h" 15 #include "base/values.h"
15 #include "build/build_config.h" 16 #include "build/build_config.h"
16 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h" 17 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h"
17 #include "chrome/browser/profiles/incognito_mode_policy_handler.h" 18 #include "chrome/browser/profiles/incognito_mode_policy_handler.h"
18 #include "chrome/common/chrome_switches.h" 19 #include "chrome/common/chrome_switches.h"
(...skipping 776 matching lines...) Expand 10 before | Expand all | Expand 10 after
795 handlers->AddHandler(make_scoped_ptr(new IntRangePolicyHandler( 796 handlers->AddHandler(make_scoped_ptr(new IntRangePolicyHandler(
796 key::kUptimeLimit, prefs::kUptimeLimit, 3600, INT_MAX, true))); 797 key::kUptimeLimit, prefs::kUptimeLimit, 3600, INT_MAX, true)));
797 handlers->AddHandler(make_scoped_ptr(new IntRangePolicyHandler( 798 handlers->AddHandler(make_scoped_ptr(new IntRangePolicyHandler(
798 key::kDeviceLoginScreenDefaultScreenMagnifierType, NULL, 0, 799 key::kDeviceLoginScreenDefaultScreenMagnifierType, NULL, 0,
799 ui::MAGNIFIER_FULL, false))); 800 ui::MAGNIFIER_FULL, false)));
800 // TODO(binjin): Remove LegacyPoliciesDeprecatingPolicyHandler for these two 801 // TODO(binjin): Remove LegacyPoliciesDeprecatingPolicyHandler for these two
801 // policies once deprecation of legacy power management policies is done. 802 // policies once deprecation of legacy power management policies is done.
802 // http://crbug.com/346229 803 // http://crbug.com/346229
803 handlers->AddHandler( 804 handlers->AddHandler(
804 make_scoped_ptr(new LegacyPoliciesDeprecatingPolicyHandler( 805 make_scoped_ptr(new LegacyPoliciesDeprecatingPolicyHandler(
805 power_management_idle_legacy_policies.Pass(), 806 std::move(power_management_idle_legacy_policies),
806 make_scoped_ptr( 807 make_scoped_ptr(
807 new PowerManagementIdleSettingsPolicyHandler(chrome_schema))))); 808 new PowerManagementIdleSettingsPolicyHandler(chrome_schema)))));
808 handlers->AddHandler( 809 handlers->AddHandler(
809 make_scoped_ptr(new LegacyPoliciesDeprecatingPolicyHandler( 810 make_scoped_ptr(new LegacyPoliciesDeprecatingPolicyHandler(
810 screen_lock_legacy_policies.Pass(), 811 std::move(screen_lock_legacy_policies),
811 make_scoped_ptr(new ScreenLockDelayPolicyHandler(chrome_schema))))); 812 make_scoped_ptr(new ScreenLockDelayPolicyHandler(chrome_schema)))));
812 handlers->AddHandler( 813 handlers->AddHandler(
813 make_scoped_ptr(new ExternalDataPolicyHandler(key::kUserAvatarImage))); 814 make_scoped_ptr(new ExternalDataPolicyHandler(key::kUserAvatarImage)));
814 handlers->AddHandler( 815 handlers->AddHandler(
815 make_scoped_ptr(new ExternalDataPolicyHandler(key::kWallpaperImage))); 816 make_scoped_ptr(new ExternalDataPolicyHandler(key::kWallpaperImage)));
816 handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler( 817 handlers->AddHandler(make_scoped_ptr(new SimpleSchemaValidatingPolicyHandler(
817 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT, 818 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT,
818 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 819 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
819 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 820 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
820 handlers->AddHandler(make_scoped_ptr( 821 handlers->AddHandler(make_scoped_ptr(
821 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 822 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
822 #endif // defined(OS_CHROMEOS) 823 #endif // defined(OS_CHROMEOS)
823 824
824 return handlers; 825 return handlers;
825 } 826 }
826 827
827 } // namespace policy 828 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/net/nss_context_chromeos.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698