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

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

Issue 2225933002: Suppress ToS and reflect admin policy in ARC++ welcome screen (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add OS_CHROMEOS checks Created 4 years, 4 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
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>
11 11
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ptr_util.h" 14 #include "base/memory/ptr_util.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" 18 #include "chrome/browser/net/disk_cache_dir_policy_handler.h"
19 #include "chrome/browser/policy/default_geolocation_policy_handler.h"
19 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" 20 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
20 #include "chrome/browser/policy/javascript_policy_handler.h" 21 #include "chrome/browser/policy/javascript_policy_handler.h"
21 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h" 22 #include "chrome/browser/policy/managed_bookmarks_policy_handler.h"
22 #include "chrome/browser/policy/network_prediction_policy_handler.h" 23 #include "chrome/browser/policy/network_prediction_policy_handler.h"
23 #include "chrome/browser/profiles/incognito_mode_policy_handler.h" 24 #include "chrome/browser/profiles/incognito_mode_policy_handler.h"
24 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 25 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
25 #include "chrome/common/chrome_switches.h" 26 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/features.h" 27 #include "chrome/common/features.h"
27 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
28 #include "components/bookmarks/common/bookmark_pref_names.h" 29 #include "components/bookmarks/common/bookmark_pref_names.h"
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
857 handlers->AddHandler( 858 handlers->AddHandler(
858 base::WrapUnique(new ExternalDataPolicyHandler(key::kUserAvatarImage))); 859 base::WrapUnique(new ExternalDataPolicyHandler(key::kUserAvatarImage)));
859 handlers->AddHandler( 860 handlers->AddHandler(
860 base::WrapUnique(new ExternalDataPolicyHandler(key::kWallpaperImage))); 861 base::WrapUnique(new ExternalDataPolicyHandler(key::kWallpaperImage)));
861 handlers->AddHandler(base::WrapUnique(new SimpleSchemaValidatingPolicyHandler( 862 handlers->AddHandler(base::WrapUnique(new SimpleSchemaValidatingPolicyHandler(
862 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT, 863 key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT,
863 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 864 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
864 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 865 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
865 handlers->AddHandler(base::WrapUnique( 866 handlers->AddHandler(base::WrapUnique(
866 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 867 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
868 handlers->AddHandler(base::WrapUnique(new DefaultGeolocationPolicyHandler()));
867 #endif // defined(OS_CHROMEOS) 869 #endif // defined(OS_CHROMEOS)
868 870
869 return handlers; 871 return handlers;
870 } 872 }
871 873
872 } // namespace policy 874 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_support_host.cc ('k') | chrome/browser/policy/default_geolocation_policy_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698