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

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

Issue 9808105: This fixes the includes in the policy connector so that it won't (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_policy_connector.h" 5 #include "chrome/browser/policy/browser_policy_connector.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/policy/cloud_policy_provider.h" 13 #include "chrome/browser/policy/cloud_policy_provider.h"
14 #include "chrome/browser/policy/cloud_policy_provider_impl.h" 14 #include "chrome/browser/policy/cloud_policy_provider_impl.h"
15 #include "chrome/browser/policy/cloud_policy_subsystem.h" 15 #include "chrome/browser/policy/cloud_policy_subsystem.h"
16 #include "chrome/browser/policy/configuration_policy_provider.h" 16 #include "chrome/browser/policy/configuration_policy_provider.h"
17 #include "chrome/browser/policy/network_configuration_updater.h"
18 #include "chrome/browser/policy/policy_service_impl.h" 17 #include "chrome/browser/policy/policy_service_impl.h"
19 #include "chrome/browser/policy/user_policy_cache.h" 18 #include "chrome/browser/policy/user_policy_cache.h"
20 #include "chrome/browser/policy/user_policy_token_cache.h" 19 #include "chrome/browser/policy/user_policy_token_cache.h"
21 #include "chrome/browser/signin/token_service.h" 20 #include "chrome/browser/signin/token_service.h"
22 #include "chrome/common/chrome_notification_types.h" 21 #include "chrome/common/chrome_notification_types.h"
23 #include "chrome/common/chrome_paths.h" 22 #include "chrome/common/chrome_paths.h"
24 #include "chrome/common/chrome_switches.h" 23 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/net/gaia/gaia_constants.h" 24 #include "chrome/common/net/gaia/gaia_constants.h"
26 #include "chrome/common/pref_names.h" 25 #include "chrome/common/pref_names.h"
27 #include "content/public/browser/notification_details.h" 26 #include "content/public/browser/notification_details.h"
28 #include "content/public/browser/notification_source.h" 27 #include "content/public/browser/notification_source.h"
29 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
30 #include "policy/policy_constants.h" 29 #include "policy/policy_constants.h"
31 30
32 #if defined(OS_WIN) 31 #if defined(OS_WIN)
33 #include "chrome/browser/policy/configuration_policy_provider_win.h" 32 #include "chrome/browser/policy/configuration_policy_provider_win.h"
34 #elif defined(OS_MACOSX) 33 #elif defined(OS_MACOSX)
35 #include "chrome/browser/policy/configuration_policy_provider_mac.h" 34 #include "chrome/browser/policy/configuration_policy_provider_mac.h"
36 #elif defined(OS_POSIX) 35 #elif defined(OS_POSIX)
37 #include "chrome/browser/policy/config_dir_policy_provider.h" 36 #include "chrome/browser/policy/config_dir_policy_provider.h"
38 #endif 37 #endif
39 38
40 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
41 #include "chrome/browser/chromeos/cros/cros_library.h" 40 #include "chrome/browser/chromeos/cros/cros_library.h"
42 #include "chrome/browser/chromeos/system/statistics_provider.h" 41 #include "chrome/browser/chromeos/system/statistics_provider.h"
43 #include "chrome/browser/policy/app_pack_updater.h" 42 #include "chrome/browser/policy/app_pack_updater.h"
44 #include "chrome/browser/policy/device_policy_cache.h" 43 #include "chrome/browser/policy/device_policy_cache.h"
44 #include "chrome/browser/policy/network_configuration_updater.h"
45 #endif 45 #endif
46 46
47 using content::BrowserThread; 47 using content::BrowserThread;
48 48
49 namespace policy { 49 namespace policy {
50 50
51 namespace { 51 namespace {
52 52
53 // Subdirectory in the user's profile for storing user policies. 53 // Subdirectory in the user's profile for storing user policies.
54 const FilePath::CharType kPolicyDir[] = FILE_PATH_LITERAL("Device Management"); 54 const FilePath::CharType kPolicyDir[] = FILE_PATH_LITERAL("Device Management");
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after
555 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); 555 config_dir_path.Append(FILE_PATH_LITERAL("recommended")));
556 } else { 556 } else {
557 return NULL; 557 return NULL;
558 } 558 }
559 #else 559 #else
560 return NULL; 560 return NULL;
561 #endif 561 #endif
562 } 562 }
563 563
564 } // namespace policy 564 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698