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

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

Issue 10917266: Rename "chrome/browser/policy/policy_constants.h" so that it doesn't clash with the generated "poli… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 (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/user_cloud_policy_manager.h" 5 #include "chrome/browser/policy/user_cloud_policy_manager.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 "chrome/browser/policy/cloud_policy_service.h" 9 #include "chrome/browser/policy/cloud_policy_service.h"
10 #include "chrome/browser/policy/policy_constants.h" 10 #include "chrome/browser/policy/policy_types.h"
11 #include "chrome/common/pref_names.h" 11 #include "chrome/common/pref_names.h"
12 12
13 namespace policy { 13 namespace policy {
14 14
15 UserCloudPolicyManager::UserCloudPolicyManager( 15 UserCloudPolicyManager::UserCloudPolicyManager(
16 scoped_ptr<CloudPolicyStore> store, 16 scoped_ptr<CloudPolicyStore> store,
17 bool wait_for_policy_fetch) 17 bool wait_for_policy_fetch)
18 : CloudPolicyManager(store.Pass()), 18 : CloudPolicyManager(store.Pass()),
19 wait_for_policy_fetch_(wait_for_policy_fetch) {} 19 wait_for_policy_fetch_(wait_for_policy_fetch) {}
20 20
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 void UserCloudPolicyManager::OnClientError(CloudPolicyClient* client) { 123 void UserCloudPolicyManager::OnClientError(CloudPolicyClient* client) {
124 DCHECK_EQ(cloud_policy_client(), client); 124 DCHECK_EQ(cloud_policy_client(), client);
125 CancelWaitForPolicyFetch(); 125 CancelWaitForPolicyFetch();
126 } 126 }
127 127
128 void UserCloudPolicyManager::OnInitialPolicyFetchComplete() { 128 void UserCloudPolicyManager::OnInitialPolicyFetchComplete() {
129 CancelWaitForPolicyFetch(); 129 CancelWaitForPolicyFetch();
130 } 130 }
131 131
132 } // namespace policy 132 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/policy/policy_types.h ('k') | chrome/browser/ui/webui/options/preferences_browsertest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698