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

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

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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 | Annotate | Revision Log
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 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 { key::kVideoCaptureAllowedUrls, 353 { key::kVideoCaptureAllowedUrls,
354 prefs::kVideoCaptureAllowedUrls, 354 prefs::kVideoCaptureAllowedUrls,
355 base::Value::TYPE_LIST }, 355 base::Value::TYPE_LIST },
356 { key::kHideWebStoreIcon, 356 { key::kHideWebStoreIcon,
357 prefs::kHideWebStoreIcon, 357 prefs::kHideWebStoreIcon,
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::kSupervisedUserCreationAllowed,
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 368
369 #if !defined(OS_MACOSX) && !defined(OS_IOS) 369 #if !defined(OS_MACOSX) && !defined(OS_IOS)
370 { key::kFullscreenAllowed, 370 { key::kFullscreenAllowed,
371 prefs::kFullscreenAllowed, 371 prefs::kFullscreenAllowed,
372 base::Value::TYPE_BOOLEAN }, 372 base::Value::TYPE_BOOLEAN },
373 { key::kFullscreenAllowed, 373 { key::kFullscreenAllowed,
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 731 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
732 new ExternalDataPolicyHandler(key::kUserAvatarImage))); 732 new ExternalDataPolicyHandler(key::kUserAvatarImage)));
733 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>( 733 handlers->AddHandler(make_scoped_ptr<ConfigurationPolicyHandler>(
734 new ExternalDataPolicyHandler(key::kWallpaperImage))); 734 new ExternalDataPolicyHandler(key::kWallpaperImage)));
735 #endif // defined(OS_CHROMEOS) 735 #endif // defined(OS_CHROMEOS)
736 736
737 return handlers.Pass(); 737 return handlers.Pass();
738 } 738 }
739 739
740 } // namespace policy 740 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc ('k') | chrome/browser/profiles/avatar_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698