Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 358 base::Value::TYPE_BOOLEAN }, | 358 base::Value::TYPE_BOOLEAN }, |
| 359 { key::kVariationsRestrictParameter, | 359 { key::kVariationsRestrictParameter, |
| 360 prefs::kVariationsRestrictParameter, | 360 prefs::kVariationsRestrictParameter, |
| 361 base::Value::TYPE_STRING }, | 361 base::Value::TYPE_STRING }, |
| 362 { key::kSupervisedUserCreationEnabled, | 362 { key::kSupervisedUserCreationEnabled, |
| 363 prefs::kManagedUserCreationAllowed, | 363 prefs::kManagedUserCreationAllowed, |
| 364 base::Value::TYPE_BOOLEAN }, | 364 base::Value::TYPE_BOOLEAN }, |
| 365 { key::kForceEphemeralProfiles, | 365 { key::kForceEphemeralProfiles, |
| 366 prefs::kForceEphemeralProfiles, | 366 prefs::kForceEphemeralProfiles, |
| 367 base::Value::TYPE_BOOLEAN }, | 367 base::Value::TYPE_BOOLEAN }, |
| 368 { key::kTouchVirtualKeyboardEnabled, | |
|
bartfab (slow)
2014/06/13 12:15:53
This needs to move to the #if defined(OS_CHROMEOS)
rsadam
2014/06/13 15:28:46
Done.
| |
| 369 prefs::kVirtualKeyboardEnabled, | |
| 370 base::Value::TYPE_BOOLEAN }, | |
| 368 | 371 |
| 369 #if !defined(OS_MACOSX) && !defined(OS_IOS) | 372 #if !defined(OS_MACOSX) && !defined(OS_IOS) |
| 370 { key::kFullscreenAllowed, | 373 { key::kFullscreenAllowed, |
| 371 prefs::kFullscreenAllowed, | 374 prefs::kFullscreenAllowed, |
| 372 base::Value::TYPE_BOOLEAN }, | 375 base::Value::TYPE_BOOLEAN }, |
| 373 { key::kFullscreenAllowed, | 376 { key::kFullscreenAllowed, |
| 374 apps::prefs::kAppFullscreenAllowed, | 377 apps::prefs::kAppFullscreenAllowed, |
| 375 base::Value::TYPE_BOOLEAN }, | 378 base::Value::TYPE_BOOLEAN }, |
| 376 #endif // !defined(OS_MACOSX) && !defined(OS_IOS) | 379 #endif // !defined(OS_MACOSX) && !defined(OS_IOS) |
| 377 | 380 |
| (...skipping 353 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 731 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 734 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 732 new ExternalDataPolicyHandler(key::kUserAvatarImage))); | 735 new ExternalDataPolicyHandler(key::kUserAvatarImage))); |
| 733 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( | 736 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( |
| 734 new ExternalDataPolicyHandler(key::kWallpaperImage))); | 737 new ExternalDataPolicyHandler(key::kWallpaperImage))); |
| 735 #endif // defined(OS_CHROMEOS) | 738 #endif // defined(OS_CHROMEOS) |
| 736 | 739 |
| 737 return handlers.Pass(); | 740 return handlers.Pass(); |
| 738 } | 741 } |
| 739 | 742 |
| 740 } // namespace policy | 743 } // namespace policy |
| OLD | NEW |