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

Unified Diff: chrome/browser/browser_process_impl.h

Issue 6312121: Add initial device policy infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix race condition and tests. Created 9 years, 11 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
« no previous file with comments | « chrome/browser/browser_process.h ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.h
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 5a19629ad5083333fec84b808dac3b104c64fdb5..d059cc748ea724eec7d16cf34286936cbd9e7da9 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -15,9 +15,9 @@
#include "base/basictypes.h"
#include "base/message_loop.h"
+#include "base/scoped_ptr.h"
#include "base/threading/non_thread_safe.h"
#include "base/timer.h"
-#include "base/scoped_ptr.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/download/download_status_updater.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
@@ -62,8 +62,7 @@ class BrowserProcessImpl : public BrowserProcess,
virtual SidebarManager* sidebar_manager();
virtual ui::Clipboard* clipboard();
virtual NotificationUIManager* notification_ui_manager();
- virtual policy::ConfigurationPolicyProviderKeeper*
- configuration_policy_provider_keeper();
+ virtual policy::BrowserPolicyContext* browser_policy_context();
virtual IconManager* icon_manager();
virtual ThumbnailGenerator* GetThumbnailGenerator();
virtual AutomationProviderList* InitAutomationProviderList();
@@ -185,9 +184,8 @@ class BrowserProcessImpl : public BrowserProcess,
bool created_sidebar_manager_;
scoped_refptr<SidebarManager> sidebar_manager_;
- bool created_configuration_policy_provider_keeper_;
- scoped_ptr<policy::ConfigurationPolicyProviderKeeper>
- configuration_policy_provider_keeper_;
+ bool created_browser_policy_context_;
+ scoped_ptr<policy::BrowserPolicyContext> browser_policy_context_;
scoped_refptr<printing::PrintPreviewTabController>
print_preview_tab_controller_;
« no previous file with comments | « chrome/browser/browser_process.h ('k') | chrome/browser/browser_process_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698