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

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

Issue 1246753003: Move a subset of chrome/browser/chromeos/drive into components/drive (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed incorrect reference to a GYP dependency. Created 5 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
« no previous file with comments | « chrome/browser/policy/DEPS ('k') | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/prefs/pref_value_map.h" 10 #include "base/prefs/pref_value_map.h"
(...skipping 25 matching lines...) Expand all
36 #if !defined(OS_IOS) 36 #if !defined(OS_IOS)
37 #include "chrome/browser/net/disk_cache_dir_policy_handler.h" 37 #include "chrome/browser/net/disk_cache_dir_policy_handler.h"
38 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h" 38 #include "chrome/browser/policy/file_selection_dialogs_policy_handler.h"
39 #include "chrome/browser/policy/javascript_policy_handler.h" 39 #include "chrome/browser/policy/javascript_policy_handler.h"
40 #include "chrome/browser/policy/network_prediction_policy_handler.h" 40 #include "chrome/browser/policy/network_prediction_policy_handler.h"
41 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h" 41 #include "chrome/browser/sessions/restore_on_startup_policy_handler.h"
42 #include "components/sync_driver/sync_policy_handler.h" 42 #include "components/sync_driver/sync_policy_handler.h"
43 #endif 43 #endif
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 #include "chrome/browser/chromeos/drive/drive_pref_names.h"
47 #include "chrome/browser/chromeos/platform_keys/key_permissions_policy_handler.h " 46 #include "chrome/browser/chromeos/platform_keys/key_permissions_policy_handler.h "
48 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h " 47 #include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h "
49 #include "chromeos/chromeos_pref_names.h" 48 #include "chromeos/chromeos_pref_names.h"
50 #include "chromeos/dbus/power_policy_controller.h" 49 #include "chromeos/dbus/power_policy_controller.h"
50 #include "components/drive/drive_pref_names.h"
51 #include "components/user_manager/user.h" 51 #include "components/user_manager/user.h"
52 #include "components/user_manager/user_manager.h" 52 #include "components/user_manager/user_manager.h"
53 #include "ui/chromeos/accessibility_types.h" 53 #include "ui/chromeos/accessibility_types.h"
54 #endif 54 #endif
55 55
56 #if !defined(OS_ANDROID) && !defined(OS_IOS) 56 #if !defined(OS_ANDROID) && !defined(OS_IOS)
57 #include "chrome/browser/download/download_dir_policy_handler.h" 57 #include "chrome/browser/download/download_dir_policy_handler.h"
58 #endif 58 #endif
59 59
60 #if defined(ENABLE_EXTENSIONS) 60 #if defined(ENABLE_EXTENSIONS)
(...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after
791 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED, 791 SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,
792 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED))); 792 SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));
793 handlers->AddHandler(make_scoped_ptr( 793 handlers->AddHandler(make_scoped_ptr(
794 new chromeos::KeyPermissionsPolicyHandler(chrome_schema))); 794 new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));
795 #endif // defined(OS_CHROMEOS) 795 #endif // defined(OS_CHROMEOS)
796 796
797 return handlers.Pass(); 797 return handlers.Pass();
798 } 798 }
799 799
800 } // namespace policy 800 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/DEPS ('k') | chrome/browser/ui/webui/chromeos/drive_internals_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698