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

Side by Side Diff: chrome/browser/browser_process_impl.h

Issue 1786263002: Remove uses of ENABLE_CONFIGURATION_POLICY from src/chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sort Created 4 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
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 // When each service is created, we set a flag indicating this. At this point, 5 // When each service is created, we set a flag indicating this. At this point,
6 // the service initialization could fail or succeed. This allows us to remember 6 // the service initialization could fail or succeed. This allows us to remember
7 // if we tried to create a service, and not try creating it over and over if 7 // if we tried to create a service, and not try creating it over and over if
8 // the creation failed. 8 // the creation failed.
9 9
10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 10 #ifndef CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 183
184 scoped_ptr<metrics_services_manager::MetricsServicesManager> 184 scoped_ptr<metrics_services_manager::MetricsServicesManager>
185 metrics_services_manager_; 185 metrics_services_manager_;
186 186
187 scoped_ptr<IOThread> io_thread_; 187 scoped_ptr<IOThread> io_thread_;
188 188
189 bool created_watchdog_thread_; 189 bool created_watchdog_thread_;
190 scoped_ptr<WatchDogThread> watchdog_thread_; 190 scoped_ptr<WatchDogThread> watchdog_thread_;
191 191
192 bool created_browser_policy_connector_; 192 bool created_browser_policy_connector_;
193 #if defined(ENABLE_CONFIGURATION_POLICY)
194 // Must be destroyed after |local_state_|. 193 // Must be destroyed after |local_state_|.
195 scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_; 194 scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
196 #else
197 // Must be destroyed after |local_state_|.
198 // This is a stub when policy is not enabled. Otherwise, the PolicyService
199 // is owned by the |browser_policy_connector_| and this is not used.
200 scoped_ptr<policy::PolicyService> policy_service_;
201 #endif
202 195
203 bool created_profile_manager_; 196 bool created_profile_manager_;
204 scoped_ptr<ProfileManager> profile_manager_; 197 scoped_ptr<ProfileManager> profile_manager_;
205 198
206 bool created_local_state_; 199 bool created_local_state_;
207 scoped_ptr<PrefService> local_state_; 200 scoped_ptr<PrefService> local_state_;
208 201
209 bool created_icon_manager_; 202 bool created_icon_manager_;
210 scoped_ptr<IconManager> icon_manager_; 203 scoped_ptr<IconManager> icon_manager_;
211 204
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // chrome/browser/memory/tab_manager_browsertest.cc 326 // chrome/browser/memory/tab_manager_browsertest.cc
334 scoped_ptr<memory::TabManager> tab_manager_; 327 scoped_ptr<memory::TabManager> tab_manager_;
335 #endif 328 #endif
336 329
337 shell_integration::DefaultWebClientState cached_default_web_client_state_; 330 shell_integration::DefaultWebClientState cached_default_web_client_state_;
338 331
339 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl); 332 DISALLOW_COPY_AND_ASSIGN(BrowserProcessImpl);
340 }; 333 };
341 334
342 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_ 335 #endif // CHROME_BROWSER_BROWSER_PROCESS_IMPL_H_
OLDNEW
« no previous file with comments | « chrome/browser/android/signin/signin_manager_android.cc ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698