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

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

Issue 493003002: Merge apps/pref* to extensions/browser/pref* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | 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 30 matching lines...) Expand all
41 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 41 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
42 #include "chromeos/dbus/power_policy_controller.h" 42 #include "chromeos/dbus/power_policy_controller.h"
43 #include "components/user_manager/user.h" 43 #include "components/user_manager/user.h"
44 #include "components/user_manager/user_manager.h" 44 #include "components/user_manager/user_manager.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(OS_MACOSX) && !defined(OS_IOS)
52 #include "apps/pref_names.h"
53 #endif
54
55 #if defined(ENABLE_EXTENSIONS) 51 #if defined(ENABLE_EXTENSIONS)
56 #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"
57 #include "chrome/browser/extensions/policy_handlers.h" 53 #include "chrome/browser/extensions/policy_handlers.h"
58 #include "extensions/browser/pref_names.h" 54 #include "extensions/browser/pref_names.h"
59 #include "extensions/common/manifest.h" 55 #include "extensions/common/manifest.h"
60 #endif 56 #endif
61 57
62 namespace policy { 58 namespace policy {
63 59
64 namespace { 60 namespace {
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 { key::kForceEphemeralProfiles, 362 { key::kForceEphemeralProfiles,
367 prefs::kForceEphemeralProfiles, 363 prefs::kForceEphemeralProfiles,
368 base::Value::TYPE_BOOLEAN }, 364 base::Value::TYPE_BOOLEAN },
369 365
370 #if !defined(OS_MACOSX) && !defined(OS_IOS) 366 #if !defined(OS_MACOSX) && !defined(OS_IOS)
371 { key::kFullscreenAllowed, 367 { key::kFullscreenAllowed,
372 prefs::kFullscreenAllowed, 368 prefs::kFullscreenAllowed,
373 base::Value::TYPE_BOOLEAN }, 369 base::Value::TYPE_BOOLEAN },
374 #if defined(ENABLE_EXTENSIONS) 370 #if defined(ENABLE_EXTENSIONS)
375 { key::kFullscreenAllowed, 371 { key::kFullscreenAllowed,
376 apps::prefs::kAppFullscreenAllowed, 372 extensions::pref_names::kAppFullscreenAllowed,
377 base::Value::TYPE_BOOLEAN }, 373 base::Value::TYPE_BOOLEAN },
378 #endif // defined(ENABLE_EXTENSIONS) 374 #endif // defined(ENABLE_EXTENSIONS)
379 #endif // !defined(OS_MACOSX) && !defined(OS_IOS) 375 #endif // !defined(OS_MACOSX) && !defined(OS_IOS)
380 376
381 #if defined(OS_CHROMEOS) 377 #if defined(OS_CHROMEOS)
382 { key::kChromeOsLockOnIdleSuspend, 378 { key::kChromeOsLockOnIdleSuspend,
383 prefs::kEnableAutoScreenLock, 379 prefs::kEnableAutoScreenLock,
384 base::Value::TYPE_BOOLEAN }, 380 base::Value::TYPE_BOOLEAN },
385 { key::kChromeOsReleaseChannel, 381 { key::kChromeOsReleaseChannel,
386 prefs::kChromeOsReleaseChannel, 382 prefs::kChromeOsReleaseChannel,
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
796 chrome_schema, 792 chrome_schema,
797 SCHEMA_STRICT, 793 SCHEMA_STRICT,
798 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 794 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
799 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 795 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
800 #endif // defined(OS_CHROMEOS) 796 #endif // defined(OS_CHROMEOS)
801 797
802 return handlers.Pass(); 798 return handlers.Pass();
803 } 799 }
804 800
805 } // namespace policy 801 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698