Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #ifndef CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ | 5 #ifndef CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ |
| 6 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ | 6 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
| 14 #include "chrome/browser/policy/cloud_policy_constants.h" | 14 #include "chrome/browser/policy/cloud/cloud_policy_constants.h" |
| 15 #include "chrome/browser/policy/configuration_policy_handler_list.h" | 15 #include "chrome/browser/policy/configuration_policy_handler_list.h" |
| 16 #include "chrome/browser/policy/proxy_policy_provider.h" | 16 |
| 17 #if defined(OS_CHROMEOS) | |
| 18 #include "chrome/browser/chromeos/policy/proxy_policy_provider.h" | |
|
Joao da Silva
2013/03/13 19:02:58
There's an OS_CHROMEOS block below
Mattias Nissler (ping if slow)
2013/03/14 09:47:56
But not for #includes?
Joao da Silva
2013/03/14 10:06:34
Teehee, that's right :-)
| |
| 19 #endif | |
| 17 | 20 |
| 18 class PrefRegistrySimple; | 21 class PrefRegistrySimple; |
| 19 class PrefService; | 22 class PrefService; |
| 20 class Profile; | 23 class Profile; |
| 21 | 24 |
| 22 namespace net { | 25 namespace net { |
| 23 class URLRequestContextGetter; | 26 class URLRequestContextGetter; |
| 24 } | 27 } |
| 25 | 28 |
| 26 namespace policy { | 29 namespace policy { |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 217 scoped_ptr<AppPackUpdater> app_pack_updater_; | 220 scoped_ptr<AppPackUpdater> app_pack_updater_; |
| 218 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; | 221 scoped_ptr<NetworkConfigurationUpdater> network_configuration_updater_; |
| 219 #endif | 222 #endif |
| 220 | 223 |
| 221 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector); | 224 DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector); |
| 222 }; | 225 }; |
| 223 | 226 |
| 224 } // namespace policy | 227 } // namespace policy |
| 225 | 228 |
| 226 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ | 229 #endif // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_ |
| OLD | NEW |