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

Unified Diff: chrome/browser/policy/file_based_policy_loader.cc

Issue 10384145: Removed ConfigurationPolicyProvider::Provide(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebased Created 8 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/file_based_policy_loader.cc
diff --git a/chrome/browser/policy/file_based_policy_loader.cc b/chrome/browser/policy/file_based_policy_loader.cc
index 763cb99a2e099b7783ca54fbca60f438f9dd61d8..c0430f7f8572bbf89be0c4856e5bf06f9d3f4cd5 100644
--- a/chrome/browser/policy/file_based_policy_loader.cc
+++ b/chrome/browser/policy/file_based_policy_loader.cc
@@ -6,7 +6,7 @@
#include "base/files/file_path_watcher.h"
#include "base/memory/ref_counted.h"
-#include "chrome/browser/policy/policy_map.h"
+#include "chrome/browser/policy/policy_bundle.h"
#include "content/public/browser/browser_thread.h"
using ::base::files::FilePathWatcher;
@@ -74,7 +74,8 @@ void FileBasedPolicyLoader::Reload(bool force) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
if (!delegate()) {
- PostUpdatePolicyTask(NULL);
+ scoped_ptr<PolicyBundle> empty_bundle;
+ PostUpdatePolicyTask(empty_bundle.Pass());
return;
}
@@ -87,7 +88,7 @@ void FileBasedPolicyLoader::Reload(bool force) {
}
// Load the policy definitions.
- scoped_ptr<PolicyMap> new_policy(delegate()->Load());
+ scoped_ptr<PolicyBundle> bundle(delegate()->Load());
// Check again in case the directory has changed while reading it.
if (!force && !IsSafeToReloadPolicy(now, &delay)) {
@@ -95,7 +96,7 @@ void FileBasedPolicyLoader::Reload(bool force) {
return;
}
- PostUpdatePolicyTask(new_policy.release());
+ PostUpdatePolicyTask(bundle.Pass());
ScheduleFallbackReloadTask();
}

Powered by Google App Engine
This is Rietveld 408576698