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

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

Issue 682943002: Make chrome/browser/chromeos/accessibility compile on Athena with use_ash=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@athena_do_not_use_ash41_scroll_end_effect
Patch Set: Created 6 years, 1 month 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
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/values.h" 10 #include "base/values.h"
(...skipping 19 matching lines...) Expand all
30 #if !defined(OS_IOS) 30 #if !defined(OS_IOS)
31 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" 31 #include "chrome/browser/net/disk_cache_dir_policy_handler.h"
32 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" 32 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
33 #include "chrome/browser/policy/javascript_policy_handler.h" 33 #include "chrome/browser/policy/javascript_policy_handler.h"
34 #include "chrome/browser/policy/network_prediction_policy_handler.h" 34 #include "chrome/browser/policy/network_prediction_policy_handler.h"
35 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 35 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
36 #include "chrome/browser/sync/sync_policy_handler.h" 36 #include "chrome/browser/sync/sync_policy_handler.h"
37 #endif 37 #endif
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 #include "ash/magnifier/magnifier_constants.h"
41 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 40 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
42 #include "chromeos/dbus/power_policy_controller.h" 41 #include "chromeos/dbus/power_policy_controller.h"
43 #include "components/user_manager/user.h" 42 #include "components/user_manager/user.h"
44 #include "components/user_manager/user_manager.h" 43 #include "components/user_manager/user_manager.h"
44 #include "ui/chromeos/accessibility_types.h"
45 #endif 45 #endif
46 46
47 #if !defined(OS_ANDROID) && !defined(OS_IOS) 47 #if !defined(OS_ANDROID) && !defined(OS_IOS)
48 #include "chrome/browser/download/download_dir_policy_handler.h" 48 #include "chrome/browser/download/download_dir_policy_handler.h"
49 #endif 49 #endif
50 50
51 #if defined(ENABLE_EXTENSIONS) 51 #if defined(ENABLE_EXTENSIONS)
52 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handle r.h" 52 #include "chrome/browser/extensions/api/messaging/native_messaging_policy_handle r.h"
53 #include "chrome/browser/extensions/extension_management_constants.h" 53 #include "chrome/browser/extensions/extension_management_constants.h"
54 #include "chrome/browser/extensions/policy_handlers.h" 54 #include "chrome/browser/extensions/policy_handlers.h"
(...skipping 711 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 INT_MAX, 766 INT_MAX,
767 true))); 767 true)));
768 handlers->AddHandler( 768 handlers->AddHandler(
769 make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler( 769 make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler(
770 key::kUptimeLimit, prefs::kUptimeLimit, 3600, INT_MAX, true))); 770 key::kUptimeLimit, prefs::kUptimeLimit, 3600, INT_MAX, true)));
771 handlers->AddHandler( 771 handlers->AddHandler(
772 make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler( 772 make_scoped_ptr<ConfigurationPolicyHandler>(new IntRangePolicyHandler(
773 key::kDeviceLoginScreenDefaultScreenMagnifierType, 773 key::kDeviceLoginScreenDefaultScreenMagnifierType,
774 NULL, 774 NULL,
775 0, 775 0,
776 ash::MAGNIFIER_FULL, 776 ui::MAGNIFIER_FULL,
777 false))); 777 false)));
778 // TODO(binjin): Remove LegacyPoliciesDeprecatingPolicyHandler for these two 778 // TODO(binjin): Remove LegacyPoliciesDeprecatingPolicyHandler for these two
779 // policies once deprecation of legacy power management policies is done. 779 // policies once deprecation of legacy power management policies is done.
780 // http://crbug.com/346229 780 // http://crbug.com/346229
781 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 781 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
782 new LegacyPoliciesDeprecatingPolicyHandler( 782 new LegacyPoliciesDeprecatingPolicyHandler(
783 power_management_idle_legacy_policies.Pass(), 783 power_management_idle_legacy_policies.Pass(),
784 make_scoped_ptr<SchemaValidatingPolicyHandler>( 784 make_scoped_ptr<SchemaValidatingPolicyHandler>(
785 new PowerManagementIdleSettingsPolicyHandler(chrome_schema))))); 785 new PowerManagementIdleSettingsPolicyHandler(chrome_schema)))));
786 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 786 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
(...skipping 12 matching lines...) Expand all
799 chrome_schema, 799 chrome_schema,
800 SCHEMA_STRICT, 800 SCHEMA_STRICT,
801 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 801 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
802 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 802 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
803 #endif // defined(OS_CHROMEOS) 803 #endif // defined(OS_CHROMEOS)
804 804
805 return handlers.Pass(); 805 return handlers.Pass();
806 } 806 }
807 807
808 } // namespace policy 808 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/system/tray_accessibility_browsertest.cc ('k') | chrome/browser/policy/policy_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698